diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0bb5566fb..5c48898a8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
+### Fixed
+- [#1897] Close menu button without selecting specific item
 
 ## [17.0.4] - 2022-12-02
 ### Fixed
@@ -2541,7 +2543,8 @@ All notable changes to this project will be documented in this file.
 ### Added
 - Initial public release
 
-[Unreleased]: https://github.com/jindrapetrik/jpexs-decompiler/compare/version17.0.3...dev
+[Unreleased]: https://github.com/jindrapetrik/jpexs-decompiler/compare/version17.0.4...dev
+[17.0.4]: https://github.com/jindrapetrik/jpexs-decompiler/compare/version17.0.3...version17.0.4
 [17.0.3]: https://github.com/jindrapetrik/jpexs-decompiler/compare/version17.0.2...version17.0.3
 [17.0.2]: https://github.com/jindrapetrik/jpexs-decompiler/compare/version17.0.1...version17.0.2
 [17.0.1]: https://github.com/jindrapetrik/jpexs-decompiler/compare/version17.0.0...version17.0.1
@@ -2675,6 +2678,7 @@ All notable changes to this project will be documented in this file.
 [alpha 9]: https://github.com/jindrapetrik/jpexs-decompiler/compare/alpha8...alpha9
 [alpha 8]: https://github.com/jindrapetrik/jpexs-decompiler/compare/alpha7...alpha8
 [alpha 7]: https://github.com/jindrapetrik/jpexs-decompiler/releases/tag/alpha7
+[#1897]: https://www.free-decompiler.com/flash/issues/1897
 [#1888]: https://www.free-decompiler.com/flash/issues/1888
 [#1895]: https://www.free-decompiler.com/flash/issues/1895
 [#1896]: https://www.free-decompiler.com/flash/issues/1896
diff --git a/src/com/jpexs/decompiler/flash/gui/MainFrameMenu.java b/src/com/jpexs/decompiler/flash/gui/MainFrameMenu.java
index 62cf2a519..eb0ab7d68 100644
--- a/src/com/jpexs/decompiler/flash/gui/MainFrameMenu.java
+++ b/src/com/jpexs/decompiler/flash/gui/MainFrameMenu.java
@@ -237,6 +237,21 @@ public abstract class MainFrameMenu implements MenuBuilder {
         }
     }
 
+    private void enumerateListsToClose(Set<OpenableList> listsToClose, Openable openable) {
+        if (openable instanceof SWF) {
+            SWF swf = (SWF) openable;
+            if (swf.binaryData != null) {
+                // embedded swf
+                swf.binaryData.innerSwf = null;
+                swf.clearTagSwfs();
+            } else {
+                listsToClose.add(swf.openableList);
+            }
+        } else if (openable != null) {
+            listsToClose.add(openable.getOpenableList());
+        }
+    }
+    
     protected void closeActionPerformed(ActionEvent evt) {
         if (Main.isWorking()) {
             return;
@@ -247,20 +262,12 @@ public abstract class MainFrameMenu implements MenuBuilder {
                 listsToClose.add((OpenableList) item);
             } else {
                 Openable itemOpenable = item.getOpenable();
-                if (itemOpenable instanceof SWF) {
-                    SWF swf = (SWF) itemOpenable;
-                    if (swf.binaryData != null) {
-                        // embedded swf
-                        swf.binaryData.innerSwf = null;
-                        swf.clearTagSwfs();
-                    } else {
-                        listsToClose.add(swf.openableList);
-                    }
-                } else if (itemOpenable != null) {
-                    listsToClose.add(itemOpenable.getOpenableList());
-                }
+                enumerateListsToClose(listsToClose, itemOpenable);
             }
         }
+        if (openable != null) {
+            enumerateListsToClose(listsToClose, openable);
+        }
         for (OpenableList list : listsToClose) {
             Main.closeFile(list);
         }