diff --git a/src/main/frontend/components/encryption.cljs b/src/main/frontend/components/encryption.cljs
index 530fc27f77..515cfb6b06 100644
--- a/src/main/frontend/components/encryption.cljs
+++ b/src/main/frontend/components/encryption.cljs
@@ -73,6 +73,9 @@
         (t :no)]]]]))
 
 (defn encryption-setup-dialog
-  [repo-url]
-  (fn [close-fn]
-    (encryption-setup-dialog-inner repo-url close-fn)))
\ No newline at end of file
+  [repo-url close-fn]
+  (fn [close-modal-fn]
+    (let [close-fn (fn []
+                     (close-fn)
+                     (close-modal-fn))]
+      (encryption-setup-dialog-inner repo-url close-fn))))
diff --git a/src/main/frontend/handler/repo.cljs b/src/main/frontend/handler/repo.cljs
index 9d545a8ad2..782aba945a 100644
--- a/src/main/frontend/handler/repo.cljs
+++ b/src/main/frontend/handler/repo.cljs
@@ -198,8 +198,10 @@
                                     (:file/content %)) files)]
           (file-handler/restore-config! repo-url content true))))
     (when first-clone?
-      (create-default-files! repo-url)
-      (state/set-modal! (encryption/encryption-setup-dialog repo-url)))
+      (state/set-modal!
+       (encryption/encryption-setup-dialog
+        repo-url
+        #(create-default-files! repo-url))))
     (when re-render?
       (ui-handler/re-render-root! re-render-opts))
     (state/set-importing-to-db! false)))