diff --git a/harbour-weechatrelay.pro b/harbour-weechatrelay.pro
index 8450134..7f146ce 100644
--- a/harbour-weechatrelay.pro
+++ b/harbour-weechatrelay.pro
@@ -50,5 +50,7 @@ HEADERS += \
 
 QT += network
 
+# This is needed on the dev machine to get Qt Creator intellisense working correctly
+# It should have no adverse effect onother machines, though
 INCLUDEPATH += /Users/nicd/SailfishOS/mersdk/targets/SailfishOS-armv7hl/usr/include/c++/4.6.4
 
diff --git a/qml/pages/AddConnection.qml b/qml/pages/AddConnection.qml
index 3bafa40..33368c6 100644
--- a/qml/pages/AddConnection.qml
+++ b/qml/pages/AddConnection.qml
@@ -115,6 +115,10 @@ Dialog {
                 placeholderText: "Connection name"
                 width: parent.width
                 onTextChanged: setCanAccept();
+
+                EnterKey.enabled: text.length > 0
+                EnterKey.iconSource: "image://theme/icon-m-enter-next"
+                EnterKey.onClicked: hostField.focus = true
             }
 
             Row {
@@ -127,6 +131,10 @@ Dialog {
                     placeholderText: "Hostname"
                     inputMethodHints: Qt.ImhNoAutoUppercase | Qt.ImhNoPredictiveText
                     onTextChanged: setCanAccept();
+
+                    EnterKey.enabled: text.length > 0
+                    EnterKey.iconSource: "image://theme/icon-m-enter-next"
+                    EnterKey.onClicked: portField.focus = true
                 }
 
                 TextField {
@@ -141,6 +149,10 @@ Dialog {
                     }
 
                     onTextChanged: setCanAccept();
+
+                    EnterKey.enabled: text.length > 0
+                    EnterKey.iconSource: "image://theme/icon-m-enter-next"
+                    EnterKey.onClicked: passwordField.focus = true
                 }
             }
 
@@ -150,6 +162,10 @@ Dialog {
                 width: parent.width
                 echoMode: TextInput.Password
                 onTextChanged: setCanAccept();
+
+                EnterKey.enabled: text.length > 0
+                EnterKey.iconSource: "image://theme/icon-m-enter-next"
+                EnterKey.onClicked: securityField.focus = true
             }
 
             ComboBox {