diff --git a/plugins/Git/jobs/clonejob.cpp b/plugins/Git/jobs/clonejob.cpp
index bf38446..219f322 100644
--- a/plugins/Git/jobs/clonejob.cpp
+++ b/plugins/Git/jobs/clonejob.cpp
@@ -23,7 +23,7 @@ void CloneJob::run()
 {
     auto tmp_dir = this->cloneSetup();
     auto err = this->clone(this->m_url,  tmp_dir.absolutePath(), this->m_cred, this->credentialsCB);
-    if (err) {
+    if (!err) {
         this->moveToDestination(tmp_dir, this->m_path);
     }
     this->cloneTearDown(tmp_dir);
diff --git a/po/utpass.qrouland.pot b/po/utpass.qrouland.pot
index 2f7b458..ab2df1d 100644
--- a/po/utpass.qrouland.pot
+++ b/po/utpass.qrouland.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: utpass.qrouland\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-01-20 14:43+0100\n"
+"POT-Creation-Date: 2025-01-20 15:00+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -79,27 +79,27 @@ msgstr ""
 msgid "Info"
 msgstr ""
 
-#: ../qml/pages/PasswordList.qml:43
+#: ../qml/pages/PasswordList.qml:44
 msgid "No password found"
 msgstr ""
 
-#: ../qml/pages/PasswordList.qml:54
+#: ../qml/pages/PasswordList.qml:55
 msgid "You can import a password store by cloning or"
 msgstr ""
 
-#: ../qml/pages/PasswordList.qml:60
+#: ../qml/pages/PasswordList.qml:61
 msgid "importing a password store zip in the settings"
 msgstr ""
 
-#: ../qml/pages/PasswordList.qml:93
+#: ../qml/pages/PasswordList.qml:95
 msgid "Decryption failed !"
 msgstr ""
 
-#: ../qml/pages/PasswordList.qml:107
+#: ../qml/pages/PasswordList.qml:109
 msgid "Back"
 msgstr ""
 
-#: ../qml/pages/PasswordList.qml:114 ../qml/pages/headers/MainHeader.qml:9
+#: ../qml/pages/PasswordList.qml:116 ../qml/pages/headers/MainHeader.qml:9
 #: ../qml/pages/headers/StackHeader.qml:9 UTPass.desktop.in.h:1
 msgid "UTPass"
 msgstr ""
@@ -117,26 +117,26 @@ msgstr ""
 msgid "Delete Password Store"
 msgstr ""
 
-#: ../qml/pages/settings/DeleteRepo.qml:57
+#: ../qml/pages/settings/DeleteRepo.qml:54
 msgid "You're are about to delete<br>the current Password Store.<br>Continue ?"
 msgstr ""
 
-#: ../qml/pages/settings/DeleteRepo.qml:58
+#: ../qml/pages/settings/DeleteRepo.qml:55
 #: ../qml/pages/settings/ImportZip.qml:62
 #: ../qml/pages/settings/InfoKeys.qml:140
 #: ../qml/pages/settings/git/ImportGitClone.qml:55
 msgid "Yes"
 msgstr ""
 
-#: ../qml/pages/settings/DeleteRepo.qml:71
+#: ../qml/pages/settings/DeleteRepo.qml:68
 msgid "Password Store removal failed !"
 msgstr ""
 
-#: ../qml/pages/settings/DeleteRepo.qml:80
+#: ../qml/pages/settings/DeleteRepo.qml:77
 msgid "Password Store deleted !"
 msgstr ""
 
-#: ../qml/pages/settings/DeleteRepo.qml:92
+#: ../qml/pages/settings/DeleteRepo.qml:89
 #: ../qml/pages/settings/InfoKeys.qml:182
 msgid "Info Keys"
 msgstr ""
@@ -184,7 +184,7 @@ msgid "Delete this key"
 msgstr ""
 
 #: ../qml/pages/settings/InfoKeys.qml:139
-msgid "You're are about to delete<br>%1<br>.Continue ?"
+msgid "You're are about to delete<br>%1.<br>Continue ?"
 msgstr ""
 
 #: ../qml/pages/settings/InfoKeys.qml:153
diff --git a/qml/pages/PasswordList.qml b/qml/pages/PasswordList.qml
index 966eb5f..bc0e1d2 100644
--- a/qml/pages/PasswordList.qml
+++ b/qml/pages/PasswordList.qml
@@ -33,6 +33,7 @@ Page {
         anchors.left: parent.left
         anchors.leftMargin: units.gu(2)
         anchors.rightMargin: units.gu(2)
+        visible: folderModel.count == 0
 
         Rectangle {
             width: parent.width
@@ -70,6 +71,7 @@ Page {
         anchors.right: parent.right
         anchors.left: parent.left
         spacing: 1
+        visible: folderModel.count != 0
 
         model: FolderListModel {
             id: folderModel
diff --git a/qml/pages/settings/InfoKeys.qml b/qml/pages/settings/InfoKeys.qml
index 537b375..8b20180 100644
--- a/qml/pages/settings/InfoKeys.qml
+++ b/qml/pages/settings/InfoKeys.qml
@@ -136,7 +136,7 @@ Page {
         id: infoKeysPageDeleteValidation
 
         SimpleValidationDialog {
-            text: i18n.tr("You're are about to delete<br>%1<br>.Continue ?").arg(infoKeysPage.currentKey.uid)
+            text: i18n.tr("You're are about to delete<br>%1.<br>Continue ?").arg(infoKeysPage.currentKey.uid)
             continueText: i18n.tr("Yes")
             continueColor: theme.palette.normal.negative
             onValidated: {