diff --git a/manifest.json.in b/manifest.json.in
index 7bd732e..1ac1f6e 100644
--- a/manifest.json.in
+++ b/manifest.json.in
@@ -10,7 +10,7 @@
             "content-hub": "utzip-contenthub.json"
         }
     },
-    "version": "2.6.0",
+    "version": "2.6.1",
     "maintainer": "Lionel Duboeuf <lduboeuf@ouvaton.org>",
     "framework" : "@CLICK_FRAMEWORK@"
 }
diff --git a/po/ar.po b/po/ar.po
index e784108..50faaf4 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -14,7 +14,7 @@ msgstr ""
 "Language-Team: Arabic <LL@li.org>\n"
 "Language: Arabic\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../src/qml/About.qml:11
diff --git a/po/utzip.lduboeuf.pot b/po/utzip.lduboeuf.pot
index 3180be3..29736c2 100644
--- a/po/utzip.lduboeuf.pot
+++ b/po/utzip.lduboeuf.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: utzip.lduboeuf\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-08 09:33+0000\n"
+"POT-Creation-Date: 2021-11-10 08:29+0000\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"
@@ -45,7 +45,7 @@ msgstr ""
 msgid "select all"
 msgstr ""
 
-#: ../src/qml/ArchiveExplorer.qml:140 ../src/qml/ArchiveWriter.qml:229
+#: ../src/qml/ArchiveExplorer.qml:140 ../src/qml/ArchiveWriter.qml:224
 msgid "Oups, something went wrong"
 msgstr ""
 
@@ -65,43 +65,43 @@ msgstr ""
 msgid "delete"
 msgstr ""
 
-#: ../src/qml/ArchiveWriter.qml:258
+#: ../src/qml/ArchiveWriter.qml:253
 msgid "Import files"
 msgstr ""
 
-#: ../src/qml/ArchiveWriter.qml:269
+#: ../src/qml/ArchiveWriter.qml:264
 msgid "Export archive"
 msgstr ""
 
-#: ../src/qml/ArchiveWriter.qml:276
+#: ../src/qml/ArchiveWriter.qml:271
 msgid "my archive name"
 msgstr ""
 
-#: ../src/qml/ArchiveWriter.qml:286
+#: ../src/qml/ArchiveWriter.qml:281
 msgid "format"
 msgstr ""
 
-#: ../src/qml/ArchiveWriter.qml:293 ../src/qml/ArchiveWriter.qml:340
+#: ../src/qml/ArchiveWriter.qml:288 ../src/qml/ArchiveWriter.qml:335
 msgid "cancel"
 msgstr ""
 
-#: ../src/qml/ArchiveWriter.qml:300
+#: ../src/qml/ArchiveWriter.qml:295
 msgid "save"
 msgstr ""
 
-#: ../src/qml/ArchiveWriter.qml:318
+#: ../src/qml/ArchiveWriter.qml:313
 msgid "Add folder"
 msgstr ""
 
-#: ../src/qml/ArchiveWriter.qml:324
+#: ../src/qml/ArchiveWriter.qml:319
 msgid "Folder name"
 msgstr ""
 
-#: ../src/qml/ArchiveWriter.qml:331
+#: ../src/qml/ArchiveWriter.qml:326
 msgid "new folder..."
 msgstr ""
 
-#: ../src/qml/ArchiveWriter.qml:347
+#: ../src/qml/ArchiveWriter.qml:342
 msgid "ok"
 msgstr ""
 
diff --git a/src/qml/ArchiveWriter.qml b/src/qml/ArchiveWriter.qml
index 0f4982b..54eef76 100644
--- a/src/qml/ArchiveWriter.qml
+++ b/src/qml/ArchiveWriter.qml
@@ -36,7 +36,7 @@ Page {
                 iconName: "close"
                 onTriggered: {
                     pageStack.pop()
-                    ArchiveManager.currentDir = folderModel.rootFolder
+                    ArchiveManager.currentDir = ArchiveManager.newArchiveDir
                 }
             }
         ]
@@ -62,14 +62,14 @@ Page {
                 Action {
                     iconName: "keyboard-caps-disabled"
                     text: ArchiveManager.currentName
-                    enabled: ArchiveManager.currentDir !== ""
+                    enabled: ArchiveManager.currentDir !== ArchiveManager.newArchiveDir
                     onTriggered: ArchiveManager.currentDir = root.navigation.pop()
                 },
                 Action {
                     iconName: "go-home"
                     text: i18n.tr("home")
                     onTriggered: {
-                        ArchiveManager.currentDir = folderModel.rootFolder
+                        ArchiveManager.currentDir = ArchiveManager.newArchiveDir
                         root.navigation = []
                     }
                 }
@@ -184,12 +184,7 @@ Page {
                     tmpNav.push(ArchiveManager.currentDir)
                     root.navigation = tmpNav
 
-                   // if (ArchiveManager.currentDir !== "") {
-                        ArchiveManager.currentDir = Qt.resolvedUrl(ArchiveManager.currentDir.toString() + "/" + fileName)
-                    //}
-//                    else {
-//                        ArchiveManager.currentDir = fileName
-//                    }
+                    ArchiveManager.currentDir = Qt.resolvedUrl(ArchiveManager.currentDir.toString() + "/" + fileName)
                     ListView.view.ViewItems.dragMode = false
 
                 }