diff --git a/html/index.html b/html/index.html
index 097af4cb..d74b40e8 100644
--- a/html/index.html
+++ b/html/index.html
@@ -187,9 +187,6 @@
         $('#mod-status').show().statusTooltip('updatePosition')
     }
 
-    if (PREFERENCES['dev-mode'] == "on") {
-        enable_dev_mode(true)
-    }
     if (PREFERENCES['plugins-folded'] == "true") {
         desktop.effectBox.effectBox('toggle')
     }
@@ -200,6 +197,10 @@
 
     if ({{using_app}}) {
         desktop.setupApp()
+    } else {
+        if (PREFERENCES['dev-mode'] == "on") {
+            enable_dev_mode(true)
+        }
     }
 
     // start code for ajax loading bar
diff --git a/html/js/hardware.js b/html/js/hardware.js
index 1b8c1d5f..b2096239 100644
--- a/html/js/hardware.js
+++ b/html/js/hardware.js
@@ -799,7 +799,7 @@ function HardwareManager(options) {
               btn.addClass('selected')
             }
             // Hide Device tab under mod-app
-            if (jbtn.attr('data-value') === deviceOption && options.isApp()) {
+            if (options.isApp() && (jbtn.attr('data-value') === deviceOption || jbtn.attr('data-value') === ccOption)) {
               jbtn.hide()
             }
             // Hide MIDI tab if not available