diff --git a/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java b/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java
index d06281a0..634ad845 100644
--- a/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java
+++ b/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java
@@ -100,6 +100,7 @@ public class IITC_Mobile extends Activity {
                 }
                 if (key.equals("pref_advanced_menu")) {
                     mAdvancedMenu = sharedPreferences.getBoolean("pref_advanced_menu", false);
+                    mNavigationHelper.setDebugMode(mAdvancedMenu);
                     invalidateOptionsMenu();
                     // no reload needed
                     return;
diff --git a/mobile/src/com/cradle/iitc_mobile/IITC_NavigationHelper.java b/mobile/src/com/cradle/iitc_mobile/IITC_NavigationHelper.java
index cbff8b0b..ba818f68 100644
--- a/mobile/src/com/cradle/iitc_mobile/IITC_NavigationHelper.java
+++ b/mobile/src/com/cradle/iitc_mobile/IITC_NavigationHelper.java
@@ -52,8 +52,15 @@ public class IITC_NavigationHelper extends ActionBarDrawerToggle implements OnNa
         public NavigationAdapter() {
             super(mIitc, android.R.layout.simple_list_item_1);
 
-            addAll(Pane.values());
-            // TODO: remove debug according to preferences
+            add(Pane.MAP);
+            add(Pane.INFO);
+            add(Pane.FULL);
+            add(Pane.COMPACT);
+            add(Pane.PUBLIC);
+            add(Pane.FACTION);
+
+            if (mPrefs.getBoolean("pref_advanced_menu", false))
+                add(Pane.DEBUG);
         }
 
         @Override
@@ -255,6 +262,12 @@ public class IITC_NavigationHelper extends ActionBarDrawerToggle implements OnNa
         }
     }
 
+    public void setDebugMode(boolean enabled) {
+        mNavigationAdapter.remove(Pane.DEBUG); // avoid duplicates
+        if (enabled)
+            mNavigationAdapter.add(Pane.DEBUG);
+    }
+
     public void setFullscreen(boolean fullscreen) {
         mFullscreen = fullscreen;
         if (mFullscreen && mHideInFullscreen) {