diff --git a/Toolset/palettes/menubar/revmenubar.livecodescript b/Toolset/palettes/menubar/revmenubar.livecodescript
index 5227bb425b..d56f2a29fc 100644
--- a/Toolset/palettes/menubar/revmenubar.livecodescript
+++ b/Toolset/palettes/menubar/revmenubar.livecodescript
@@ -1386,7 +1386,7 @@ private function revMenubarFileMenu pContext
       put "(Open Recent File" & return after tFile    
    end if
    
-   put enableMenuItem("&Close/W", the mode of the topStack <= 3) & return after tFile
+   put enableMenuItem("&Close/W", the mode of the topStack <= 3 and the short name of the topstack is not "revMenubar") & return after tFile
    put enableMenuItem("Close and Remove From Memor&y", tCanSaveStack) & return after tFile
    put "-" & return after tFile
    
diff --git a/notes/bugfix-21222.md b/notes/bugfix-21222.md
new file mode 100644
index 0000000000..1abfa41ac8
--- /dev/null
+++ b/notes/bugfix-21222.md
@@ -0,0 +1 @@
+# Ensure File -> Close option is disabled when the topstack is stack revMenubar