diff --git a/apps/opencs/model/prefs/state.cpp b/apps/opencs/model/prefs/state.cpp
index f95ceb896f..15f8cacef1 100644
--- a/apps/opencs/model/prefs/state.cpp
+++ b/apps/opencs/model/prefs/state.cpp
@@ -40,7 +40,6 @@ void CSMPrefs::State::declare()
         .setTooltip(
             "If a newly open top level window is showing status bars or not. "
             " Note that this does not affect existing windows.");
-    declareSeparator();
     declareBool("reuse", "Reuse Subviews", true)
         .setTooltip(
             "When a new subview is requested and a matching subview already "
@@ -58,7 +57,6 @@ void CSMPrefs::State::declare()
     declareInt("minimum-width", "Minimum subview width", 325)
         .setTooltip("Minimum width of subviews.")
         .setRange(50, 10000);
-    declareSeparator();
     EnumValue scrollbarOnly("Scrollbar Only",
         "Simple addition of scrollbars, the view window "
         "does not grow automatically.");
@@ -98,7 +96,6 @@ void CSMPrefs::State::declare()
     declareEnum("double-s", "Shift Double Click", editRecord).addValues(doubleClickValues);
     declareEnum("double-c", "Control Double Click", view).addValues(doubleClickValues);
     declareEnum("double-sc", "Shift Control Double Click", editRecordAndClose).addValues(doubleClickValues);
-    declareSeparator();
     EnumValue jumpAndSelect("Jump and Select", "Scroll new record into view and make it the selection");
     declareEnum("jump-to-added", "Action on adding or cloning a record", jumpAndSelect)
         .addValue(jumpAndSelect)
@@ -161,7 +158,6 @@ void CSMPrefs::State::declare()
     declareInt("error-height", "Initial height of the error panel", 100).setRange(100, 10000);
     declareBool("highlight-occurrences", "Highlight other occurrences of selected names", true);
     declareColour("colour-highlight", "Colour of highlighted occurrences", QColor("lightcyan"));
-    declareSeparator();
     declareColour("colour-int", "Highlight Colour: Integer Literals", QColor("darkmagenta"));
     declareColour("colour-float", "Highlight Colour: Float Literals", QColor("magenta"));
     declareColour("colour-name", "Highlight Colour: Names", QColor("grey"));
@@ -180,14 +176,12 @@ void CSMPrefs::State::declare()
 
     declareDouble("navi-wheel-factor", "Camera Zoom Sensitivity", 8).setRange(-100.0, 100.0);
     declareDouble("s-navi-sensitivity", "Secondary Camera Movement Sensitivity", 50.0).setRange(-1000.0, 1000.0);
-    declareSeparator();
 
     declareDouble("p-navi-free-sensitivity", "Free Camera Sensitivity", 1 / 650.).setPrecision(5).setRange(0.0, 1.0);
     declareBool("p-navi-free-invert", "Invert Free Camera Mouse Input", false);
     declareDouble("navi-free-lin-speed", "Free Camera Linear Speed", 1000.0).setRange(1.0, 10000.0);
     declareDouble("navi-free-rot-speed", "Free Camera Rotational Speed", 3.14 / 2).setRange(0.001, 6.28);
     declareDouble("navi-free-speed-mult", "Free Camera Speed Multiplier (from Modifier)", 8).setRange(0.001, 1000.0);
-    declareSeparator();
 
     declareDouble("p-navi-orbit-sensitivity", "Orbit Camera Sensitivity", 1 / 650.).setPrecision(5).setRange(0.0, 1.0);
     declareBool("p-navi-orbit-invert", "Invert Orbit Camera Mouse Input", false);
@@ -195,7 +189,6 @@ void CSMPrefs::State::declare()
     declareDouble("navi-orbit-speed-mult", "Orbital Camera Speed Multiplier (from Modifier)", 4)
         .setRange(0.001, 1000.0);
     declareBool("navi-orbit-const-roll", "Keep camera roll constant for orbital camera", true);
-    declareSeparator();
 
     declareBool("context-select", "Context Sensitive Selection", false);
     declareDouble("drag-factor", "Mouse sensitivity during drag operations", 1.0).setRange(0.001, 100.0);
@@ -611,16 +604,6 @@ CSMPrefs::ModifierSetting& CSMPrefs::State::declareModifier(const std::string& k
     return *setting;
 }
 
-void CSMPrefs::State::declareSeparator()
-{
-    if (mCurrentCategory == mCategories.end())
-        throw std::logic_error("no category for setting");
-
-    CSMPrefs::Setting* setting = new CSMPrefs::Setting(&mCurrentCategory->second, &mMutex, "", "");
-
-    mCurrentCategory->second.addSetting(setting);
-}
-
 void CSMPrefs::State::declareSubcategory(const QString& label)
 {
     if (mCurrentCategory == mCategories.end())
diff --git a/apps/opencs/model/prefs/state.hpp b/apps/opencs/model/prefs/state.hpp
index c74f317c94..86d2c19da6 100644
--- a/apps/opencs/model/prefs/state.hpp
+++ b/apps/opencs/model/prefs/state.hpp
@@ -75,8 +75,6 @@ namespace CSMPrefs
 
         ModifierSetting& declareModifier(const std::string& key, const QString& label, int modifier_);
 
-        void declareSeparator();
-
         void declareSubcategory(const QString& label);
 
         void setDefault(const std::string& key, const std::string& default_);
diff --git a/apps/opencs/view/prefs/keybindingpage.cpp b/apps/opencs/view/prefs/keybindingpage.cpp
index 7b6337a6ab..60170be283 100644
--- a/apps/opencs/view/prefs/keybindingpage.cpp
+++ b/apps/opencs/view/prefs/keybindingpage.cpp
@@ -80,27 +80,16 @@ namespace CSVPrefs
             int next = mPageLayout->rowCount();
             mPageLayout->addWidget(widgets.second, next, 0, 1, 2);
         }
-        else
+        else if (!setting->getLabel().isEmpty())
         {
-            if (setting->getLabel().isEmpty())
-            {
-                // Insert empty space
-                assert(mPageLayout);
+            // Create new page
+            QWidget* pageWidget = new QWidget();
+            mPageLayout = new QGridLayout(pageWidget);
+            mPageLayout->setSizeConstraint(QLayout::SetMinAndMaxSize);
 
-                int next = mPageLayout->rowCount();
-                mPageLayout->addWidget(new QWidget(), next, 0);
-            }
-            else
-            {
-                // Create new page
-                QWidget* pageWidget = new QWidget();
-                mPageLayout = new QGridLayout(pageWidget);
-                mPageLayout->setSizeConstraint(QLayout::SetMinAndMaxSize);
+            mStackedLayout->addWidget(pageWidget);
 
-                mStackedLayout->addWidget(pageWidget);
-
-                mPageSelector->addItem(setting->getLabel());
-            }
+            mPageSelector->addItem(setting->getLabel());
         }
     }
 
diff --git a/apps/opencs/view/prefs/page.cpp b/apps/opencs/view/prefs/page.cpp
index 4f04a39f00..fc70adf482 100644
--- a/apps/opencs/view/prefs/page.cpp
+++ b/apps/opencs/view/prefs/page.cpp
@@ -37,8 +37,4 @@ void CSVPrefs::Page::addSetting(CSMPrefs::Setting* setting)
     {
         mGrid->addWidget(widgets.second, next, 0, 1, 2);
     }
-    else
-    {
-        mGrid->addWidget(new QWidget(this), next, 0);
-    }
 }