diff --git a/src/main/java/cz/kamma/kfmanager/ui/FilePanelTab.java b/src/main/java/cz/kamma/kfmanager/ui/FilePanelTab.java
index ca83de8..208eb42 100644
--- a/src/main/java/cz/kamma/kfmanager/ui/FilePanelTab.java
+++ b/src/main/java/cz/kamma/kfmanager/ui/FilePanelTab.java
@@ -3318,9 +3318,15 @@ public class FilePanelTab extends JPanel {
                         deleteTempDirRecursively(currentArchiveTempDir);
                         clearOpenedArchiveSession();
                         loadDirectory(parent, false, true, () -> {
-                            restoreReturnState(returnState, true);
-                            SwingUtilities.invokeLater(() -> {
+                            if (returnState != null) {
                                 restoreReturnState(returnState, true);
+                            } else {
+                                selectItemByName(archiveName);
+                            }
+                            SwingUtilities.invokeLater(() -> {
+                                if (returnState != null) {
+                                    restoreReturnState(returnState, true);
+                                }
                                 clearArchiveReturnState();
                             });
                         });