diff --git a/data/interfaces/xfpm-settings.ui b/data/interfaces/xfpm-settings.ui
index 5f8ac45027a555769a3902e3091daa3f310ef09f..291eeeec70d8433f7950f57d57b2f471a4839b6a 100644
--- a/data/interfaces/xfpm-settings.ui
+++ b/data/interfaces/xfpm-settings.ui
@@ -1503,7 +1503,7 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkBox">
+                              <object class="GtkBox" id="brightness-level-vbox">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="orientation">vertical</property>
@@ -1547,7 +1547,7 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkBox">
+                              <object class="GtkBox" id="brightness-inactivity-vbox">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="orientation">vertical</property>
@@ -1831,7 +1831,7 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkBox">
+                              <object class="GtkBox" id="brightness-level-vbox1">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="margin_top">6</property>
@@ -1876,7 +1876,7 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkBox">
+                              <object class="GtkBox" id="brightness-inactivity-vbox1">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="hexpand">True</property>
diff --git a/settings/xfpm-settings.c b/settings/xfpm-settings.c
index 4c05342638601b4345a4421c48e90bb8f5b28457..3d55b52b4b52cc8ca592a4e29492883c7d9b9e33 100644
--- a/settings/xfpm-settings.c
+++ b/settings/xfpm-settings.c
@@ -2416,7 +2416,6 @@ xfpm_settings_dialog_new (XfconfChannel *channel, gboolean auth_suspend,
   GtkWidget *plugged_box;
   GtkWidget *viewport;
   GtkWidget *hbox;
-  GtkWidget *frame;
   GtkWidget *switch_widget;
   GtkWidget *stack;
   GtkStyleContext *context;
@@ -2582,16 +2581,34 @@ xfpm_settings_dialog_new (XfconfChannel *channel, gboolean auth_suspend,
 
   if ( !has_lcd_brightness )
   {
-    frame = GTK_WIDGET (gtk_builder_get_object (xml, "brightness-frame"));
-    gtk_widget_hide (frame);
-    frame = GTK_WIDGET (gtk_builder_get_object (xml, "handle-brightness-keys"));
-    gtk_widget_hide (frame);
-    frame = GTK_WIDGET (gtk_builder_get_object (xml, "handle-brightness-keys-label"));
-    gtk_widget_hide (frame);
-    frame = GTK_WIDGET (gtk_builder_get_object (xml, "brightness-step-count"));
-    gtk_widget_hide (frame);
-    frame = GTK_WIDGET (gtk_builder_get_object (xml, "brightness-exponential"));
-    gtk_widget_hide (frame);
+    GtkWidget *widget = GTK_WIDGET (gtk_builder_get_object (xml, "label4"));
+    gtk_widget_hide (widget);
+    widget = GTK_WIDGET (gtk_builder_get_object (xml, "brightness-level-label"));
+    gtk_widget_hide (widget);
+    widget = GTK_WIDGET (gtk_builder_get_object (xml, "brightness-inactivity-label"));
+    gtk_widget_hide (widget);
+    widget = GTK_WIDGET (gtk_builder_get_object (xml, "brightness-level-vbox"));
+    gtk_widget_hide (widget);
+    widget = GTK_WIDGET (gtk_builder_get_object (xml, "brightness-inactivity-vbox"));
+    gtk_widget_hide (widget);
+    widget = GTK_WIDGET (gtk_builder_get_object (xml, "label6"));
+    gtk_widget_hide (widget);
+    widget = GTK_WIDGET (gtk_builder_get_object (xml, "brightness-level-label1"));
+    gtk_widget_hide (widget);
+    widget = GTK_WIDGET (gtk_builder_get_object (xml, "brightness-inactivity-label1"));
+    gtk_widget_hide (widget);
+    widget = GTK_WIDGET (gtk_builder_get_object (xml, "brightness-level-vbox1"));
+    gtk_widget_hide (widget);
+    widget = GTK_WIDGET (gtk_builder_get_object (xml, "brightness-inactivity-vbox1"));
+    gtk_widget_hide (widget);
+    widget = GTK_WIDGET (gtk_builder_get_object (xml, "handle-brightness-keys"));
+    gtk_widget_hide (widget);
+    widget = GTK_WIDGET (gtk_builder_get_object (xml, "handle-brightness-keys-label"));
+    gtk_widget_hide (widget);
+    widget = GTK_WIDGET (gtk_builder_get_object (xml, "hbox4"));
+    gtk_widget_hide (widget);
+    widget = GTK_WIDGET (gtk_builder_get_object (xml, "brightness-step-count-label"));
+    gtk_widget_hide (widget);
   }
 
   if ( id != 0 )