diff --git a/client/ui/pages_logic/protocols/CloakLogic.cpp b/client/ui/pages_logic/protocols/CloakLogic.cpp
index 0062d12d..4f21895b 100644
--- a/client/ui/pages_logic/protocols/CloakLogic.cpp
+++ b/client/ui/pages_logic/protocols/CloakLogic.cpp
@@ -47,7 +47,11 @@ void CloakLogic::updateProtocolPage(const QJsonObject &ckConfig, DockerContainer
 QJsonObject CloakLogic::getProtocolConfigFromPage(QJsonObject oldConfig)
 {
     oldConfig.insert(config_key::cipher, comboBoxCipherText());
-    oldConfig.insert(config_key::site, lineEditSiteText());
+
+    QString newSite = lineEditSiteText();
+    newSite.replace("https://", "");
+    oldConfig.insert(config_key::site, newSite);
+
     oldConfig.insert(config_key::port, lineEditPortText());
 
     return oldConfig;
diff --git a/client/ui/qml/Pages/Protocols/PageProtoCloak.qml b/client/ui/qml/Pages/Protocols/PageProtoCloak.qml
index 2b5b12ca..3475a82b 100644
--- a/client/ui/qml/Pages/Protocols/PageProtoCloak.qml
+++ b/client/ui/qml/Pages/Protocols/PageProtoCloak.qml
@@ -76,11 +76,16 @@ PageProtocolBase {
             TextFieldType {
                 id: lineEdit_proto_cloak_site
                 Layout.fillWidth: true
+                focus: true
                 height: 31
                 text: logic.lineEditSiteText
                 onEditingFinished: {
                     logic.lineEditSiteText = text
                 }
+
+                onCursorRectangleChanged: {
+                    logic.lineEditSiteText = text
+                }
             }
         }
 
@@ -96,12 +101,17 @@ PageProtocolBase {
             TextFieldType {
                 id: lineEdit_proto_cloak_port
                 Layout.fillWidth: true
+                focus: true
                 height: 31
                 text: logic.lineEditPortText
                 onEditingFinished: {
                     logic.lineEditPortText = text
                 }
                 enabled: logic.lineEditPortEnabled
+
+                onCursorRectangleChanged: {
+                    logic.lineEditPortText = text
+                }
             }
         }