diff --git a/nymea-app/ui/SettingsPage.qml b/nymea-app/ui/SettingsPage.qml
index fd040ce1..121513f3 100644
--- a/nymea-app/ui/SettingsPage.qml
+++ b/nymea-app/ui/SettingsPage.qml
@@ -54,9 +54,14 @@ Page {
                 text: qsTr("Server name")
             }
             TextField {
+                id: nameTextField
                 Layout.fillWidth: true
                 text: Engine.basicConfiguration.serverName
-                onAccepted: Engine.basicConfiguration.serverName = text
+            }
+            Button {
+                text: qsTr("OK")
+                visible: nameTextField.displayText !== Engine.basicConfiguration.serverName
+                onClicked: Engine.basicConfiguration.serverName = nameTextField.displayText
             }
         }