diff --git a/src/main/frontend/components/repo.cljs b/src/main/frontend/components/repo.cljs
index 3ed953d058..71f3398876 100644
--- a/src/main/frontend/components/repo.cljs
+++ b/src/main/frontend/components/repo.cljs
@@ -478,25 +478,14 @@
 (rum/defc new-db-graph
   []
   (let [[creating-db? set-creating-db?] (hooks/use-state false)
-        rtc-group? (user-handler/rtc-group?)
-        [cloud? set-cloud?] (hooks/use-state rtc-group?)
+        [cloud? set-cloud?] (hooks/use-state false)
         [e2ee-rsa-key-ensured? set-e2ee-rsa-key-ensured?] (hooks/use-state nil)
-        input-ref (hooks/create-ref)
-        [input-value set-input-value!] (hooks/use-state "")]
-
+        input-ref (hooks/create-ref)]
     (hooks/use-effect!
      (fn []
-       (let [token (state/get-auth-id-token)
-             user-uuid (user-handler/user-uuid)]
-         (when (and rtc-group? cloud? (not e2ee-rsa-key-ensured?))
-           (when (and token user-uuid)
-             (-> (p/let [rsa-key-pair (state/<invoke-db-worker :thread-api/get-user-rsa-key-pair token user-uuid)]
-                   (set-e2ee-rsa-key-ensured? (some? rsa-key-pair)))
-                 (p/catch (fn [e]
-                            (log/error :get-user-rsa-key-pair e)
-                            e)))))))
+       (when-let [^js input (hooks/deref input-ref)]
+         (js/setTimeout #(.focus input) 32)))
      [])
-
     (letfn [(new-db-f [graph-name]
               (when-not (or (string/blank? graph-name)
                             creating-db?)
@@ -526,22 +515,28 @@
        (shui/input
         {:disabled creating-db?
          :ref input-ref
-         :auto-focus true
-         :placeholder "Graph name"
+         :placeholder "your graph name"
          :on-key-down submit!
-         :on-change (fn [e] (set-input-value! (util/evalue e)))
-         :value input-value
          :autoComplete "off"})
        (when (user-handler/rtc-group?)
          [:div.flex.flex-col
           [:div.flex.flex-row.items-center.gap-1
            (shui/checkbox
             {:id "rtc-sync"
-             :checked cloud?
+             :value cloud?
              :on-checked-change
              (fn []
-               (let [v (boolean (not cloud?))]
-                 (set-cloud? v)))})
+               (let [v (boolean (not cloud?))
+                     token (state/get-auth-id-token)
+                     user-uuid (user-handler/user-uuid)]
+                 (set-cloud? v)
+                 (when (and (true? v) (not e2ee-rsa-key-ensured?))
+                   (when (and token user-uuid)
+                     (-> (p/let [rsa-key-pair (state/<invoke-db-worker :thread-api/get-user-rsa-key-pair token user-uuid)]
+                           (set-e2ee-rsa-key-ensured? (some? rsa-key-pair)))
+                         (p/catch (fn [e]
+                                    (log/error :get-user-rsa-key-pair e)
+                                    e)))))))})
            [:label.opacity-70.text-sm
             {:for "rtc-sync"}
             "Use Logseq Sync?"]]
@@ -550,8 +545,7 @@
              {:for "rtc-sync"}
              "Need to init E2EE settings first, Settings > Encryption"])])
        (shui/button
-        {:disabled (or (and cloud? (not e2ee-rsa-key-ensured?))
-                       (string/blank? input-value))
+        {:disabled (and cloud? (not e2ee-rsa-key-ensured?))
          :on-click #(submit! % true)
          :on-key-down submit!}
         (if creating-db?