diff --git a/src/mobile-settings-window.c b/src/mobile-settings-window.c
index 7ff89229b1330bb3a3e5bec7980046cc3b2b2195..faf55ce36670dbd5c587e73ff4fa75fc1496489f 100644
--- a/src/mobile-settings-window.c
+++ b/src/mobile-settings-window.c
@@ -132,8 +132,6 @@ ms_settings_window_constructed (GObject *object)
   MobileSettingsWindow *self = MOBILE_SETTINGS_WINDOW (object);
   MobileSettingsApplication *app = MOBILE_SETTINGS_APPLICATION (g_application_get_default ());
   GtkWidget *device_panel;
-  GAction *toggle_conf_tweaks;
-  GList *pages_sorted_by_weight = NULL;
   GHashTable *parser_page_table = NULL;
 
   G_OBJECT_CLASS (mobile_settings_window_parent_class)->constructed (object);
@@ -154,13 +152,17 @@ ms_settings_window_constructed (GObject *object)
 
   ms_tweaks_parser_parse_definition_files (self->ms_tweaks_parser, TWEAKS_DATA_DIR);
   parser_page_table = ms_tweaks_parser_get_page_table (self->ms_tweaks_parser);
-  pages_sorted_by_weight = ms_tweaks_parser_sort_by_weight (parser_page_table);
 
-  g_list_foreach (pages_sorted_by_weight, add_ms_tweaks_page, self);
+  if (g_hash_table_size (parser_page_table) != 0) {
+    GList *pages_sorted_by_weight = ms_tweaks_parser_sort_by_weight (parser_page_table);
+    g_autoptr (GAction) toggle_conf_tweaks;
 
-  toggle_conf_tweaks = g_settings_create_action (self->settings, "enable-conf-tweaks");
-  g_signal_connect (self->settings, "changed::enable-conf-tweaks", G_CALLBACK (do_toggle_conf_tweaks), self);
-  g_action_map_add_action (G_ACTION_MAP (app), G_ACTION (toggle_conf_tweaks));
+    g_list_foreach (pages_sorted_by_weight, add_ms_tweaks_page, self);
+
+    toggle_conf_tweaks = g_settings_create_action (self->settings, "enable-conf-tweaks");
+    g_signal_connect (self->settings, "changed::enable-conf-tweaks", G_CALLBACK (do_toggle_conf_tweaks), self);
+    g_action_map_add_action (G_ACTION_MAP (app), G_ACTION (toggle_conf_tweaks));
+  }
 }
 
 
diff --git a/src/ui/mobile-settings-window.ui b/src/ui/mobile-settings-window.ui
index ef267565432e9c9f09eefcc4f0606796a0ad082a..9ee3df73ec735c4519dcecb9e53973e2fcc43465 100644
--- a/src/ui/mobile-settings-window.ui
+++ b/src/ui/mobile-settings-window.ui
@@ -332,6 +332,7 @@
       <item>
         <attribute name="label" translatable="yes">_Show Configurable Tweaks</attribute>
         <attribute name="action">app.enable-conf-tweaks</attribute>
+        <attribute name="hidden-when">action-disabled</attribute>
       </item>
     </section>
     <section>