diff --git a/src/octoprint/server.py b/src/octoprint/server.py
index 0bf86796..44056155 100644
--- a/src/octoprint/server.py
+++ b/src/octoprint/server.py
@@ -1207,6 +1207,8 @@ class Server():
 				printer.connect(port, baudrate)
 		try:
 			IOLoop.instance().start()
+		except KeyboardInterrupt:
+			logger.info("Goodbye!")
 		except:
 			logger.fatal("Now that is embarrassing... Something really really went wrong here. Please report this including the stacktrace below in OctoPrint's bugtracker. Thanks!")
 			logger.exception("Stacktrace follows:")
diff --git a/src/octoprint/static/js/app/main.js b/src/octoprint/static/js/app/main.js
index e4cd786e..9cc5e913 100644
--- a/src/octoprint/static/js/app/main.js
+++ b/src/octoprint/static/js/app/main.js
@@ -1,4 +1,9 @@
 $(function() {
+        //Detect mobile browsers and remove gcode pane
+        //from http://stackoverflow.com/questions/3514784/what-is-the-best-way-to-detect-a-handheld-device-in-jquery
+        if (/Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent)) {
+            $("#gcode, a[href='#gcode']").remove();
+        }
 
         //~~ Initialize view models
         var loginStateViewModel = new LoginStateViewModel();