diff --git a/Toolset/palettes/dictionary/behaviors/revdictionarybehavior.livecodescript b/Toolset/palettes/dictionary/behaviors/revdictionarybehavior.livecodescript
index da5f4b51ee..c690d515b4 100644
--- a/Toolset/palettes/dictionary/behaviors/revdictionarybehavior.livecodescript
+++ b/Toolset/palettes/dictionary/behaviors/revdictionarybehavior.livecodescript
@@ -93,11 +93,16 @@ end showUpgradeOptions
 
 # bug 17819 enable cmd+c in dictionary
 on commandKeyDown pWhich
-   if pWhich is not "C" then 
-      if pWhich is "W" then
+   switch pWhich
+      case "A"
+         -- trap Cmd + A for select all
+      case "C"
+         -- trap Cmd + C for copy
+         break
+      case "W"
          close me
-      else 
+         break
+      default
          pass commandKeyDown
-      end if
-   end if
+   end switch
 end commandKeyDown
diff --git a/notes/bugfix-18585.md b/notes/bugfix-18585.md
new file mode 100644
index 0000000000..0b8f731b64
--- /dev/null
+++ b/notes/bugfix-18585.md
@@ -0,0 +1 @@
+# Ensure Dictionary does not pass cmd+A