diff --git a/src/AnalyzeView/AnalyzeView.qml b/src/AnalyzeView/AnalyzeView.qml
index 43905e22899ab80543ff38bdc073353c63a725c4..6741d36060fb33745079e4f190af138676bd9f08 100644
--- a/src/AnalyzeView/AnalyzeView.qml
+++ b/src/AnalyzeView/AnalyzeView.qml
@@ -42,10 +42,6 @@ Rectangle {
 
     LogDownloadController {
         id: logController
-	}
-
-    MavlinkConsoleController {
-        id: conController
     }
 
     QGCFlickable {
diff --git a/src/AnalyzeView/MavlinkConsolePage.qml b/src/AnalyzeView/MavlinkConsolePage.qml
index 32d5c953784207ed06256c98cb34351a178a1acb..42d946066a84ccc75d0b47e1de961fb7f42f6146 100644
--- a/src/AnalyzeView/MavlinkConsolePage.qml
+++ b/src/AnalyzeView/MavlinkConsolePage.qml
@@ -28,6 +28,10 @@ AnalyzePage {
 
     property bool isLoaded: false
 
+    MavlinkConsoleController {
+        id: conController
+    }
+
     Component {
         id: pageComponent
 
@@ -90,6 +94,7 @@ AnalyzePage {
                     id:               command
                     Layout.fillWidth: true
                     placeholderText:  "Enter Commands here..."
+                    inputMethodHints: Qt.ImhNoAutoUppercase
 
                     function sendCommand() {
                         conController.sendCommand(text)
@@ -98,10 +103,10 @@ AnalyzePage {
                     onAccepted: sendCommand()
 
                     Keys.onPressed: {
-                        if (event.key == Qt.Key_Up) {
+                        if (event.key === Qt.Key_Up) {
                             text = conController.historyUp(text);
                             event.accepted = true;
-                        } else if (event.key == Qt.Key_Down) {
+                        } else if (event.key === Qt.Key_Down) {
                             text = conController.historyDown(text);
                             event.accepted = true;
                         }