diff --git a/index.html b/index.html
index 6c360cc..c97ed0e 100644
--- a/index.html
+++ b/index.html
@@ -382,16 +382,6 @@ $ openssl req -nodes -newkey rsa:4096 -keyout relay.pem -x509 -days 365 -out rel
                   </div>
                 </form>
               </li>
-              <li>
-                <form class="form-inline" role="form">
-                  <div class="checkbox">
-                    <label>
-                      <input type="checkbox" ng-model="debugMode">
-                      Debug Mode
-                    </label>
-                  </div>
-                </form>
-              </li>
             </ul>
           </div>
           <div class="modal-footer">
diff --git a/js/glowingbear.js b/js/glowingbear.js
index e8e8a54..59f19f0 100644
--- a/js/glowingbear.js
+++ b/js/glowingbear.js
@@ -624,6 +624,17 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
         }
     })();
 
+    // Enable debug mode if "?debug=1" or "?debug=true" is set
+    (function() {
+        window.location.search.substring(1).split('&').forEach(function(f) {
+            var segs = f.split('=');
+            if (segs[0] === "debug" && ["true", "1"].indexOf(segs[1]) != -1) {
+                $rootScope.debugMode = true;
+                return;
+            }
+        });
+    })();
+
 
     $rootScope.isWindowFocused = function() {
         if (typeof $scope.documentHidden === "undefined") {