diff --git a/octoprint/static/js/ui.js b/octoprint/static/js/ui.js
index 4b777e8c..ef9ad357 100644
--- a/octoprint/static/js/ui.js
+++ b/octoprint/static/js/ui.js
@@ -1521,7 +1521,7 @@ $(function() {
 
         //~~ Terminal
 
-        $("#terminal-send").click(function () {
+		$("#terminal-send").click(function () {
             var command = $("#terminal-command").val();
             if (command) {
                 $.ajax({
@@ -1531,7 +1531,15 @@ $(function() {
                     contentType: "application/json; charset=UTF-8",
                     data: JSON.stringify({"command": command})
                 })
+            	$("#terminal-command").val('')
             }
+            
+        })
+
+        $("#terminal-command").keyup(function(event){
+	    if(event.keyCode == 13){
+                $("#terminal-send").click()
+	    }
         })
 
         //~~ Gcode upload
diff --git a/octoprint/util/comm.py b/octoprint/util/comm.py
index 3161084d..00d63fe8 100644
--- a/octoprint/util/comm.py
+++ b/octoprint/util/comm.py
@@ -461,6 +461,7 @@ class MachineCom(object):
 		self.close()
 	
 	def _sendCommand(self, cmd):
+		cmd = cmd.upper()
 		if self._serial is None:
 			return
 		if 'M109' in cmd or 'M190' in cmd: