diff --git a/TODO b/TODO
index 18c929aa0..e4db4cc05 100644
--- a/TODO
+++ b/TODO
@@ -2,7 +2,6 @@ New config TODO
 ===============
 
 - Changing models is awfully slow
-- Add correctly working :get and :set commands
 - Implement different layers of config options correctly, not only default.
 
 Bugs
diff --git a/qutebrowser/config/config.py b/qutebrowser/config/config.py
index e81e0263a..7e74c16f0 100644
--- a/qutebrowser/config/config.py
+++ b/qutebrowser/config/config.py
@@ -219,13 +219,10 @@ class Config:
         if value:
             value = self._interpolation.before_set(self, section, option,
                                                    value)
-        if not section or section == self.default_section:
-            sectdict = self._defaults
-        else:
-            try:
-                sectdict = self._sections[section]
-            except KeyError:
-                raise NoSectionError(section)
+        try:
+            sectdict = self.config[section]
+        except KeyError:
+            raise NoSectionError(section)
         sectdict[self.optionxform(option)] = value
 
     def save(self):