diff --git a/BREAKING_CHANGES.txt b/BREAKING_CHANGES.txt
index c0ddd88698..eb7dd2ce1a 100644
--- a/BREAKING_CHANGES.txt
+++ b/BREAKING_CHANGES.txt
@@ -6,6 +6,7 @@ applied given the delay between changes being submitted and the time they were r
 and merged.
 
 ---
+* 2024-07-31 Remove commands `"command mode"`, `"dictation mode"` from custom user modes. Note that if you have any custom modes where you want these commands you could add that mode to the context of `command_and_dictation_mode.talon` or copying the command to one of your custom files.
 * 2024-07-30 Deprecate `lend` and `bend` commands in favor of `go line end | tail` and `go line start | head`.
 * 2024-07-28 Removed the following actions in favor of the new action/modifier grammar.
     https://github.com/talonhub/community/blob/37a8ebde90c8120a0b52555030988d4f54e65159/core/edit/edit.talon#L3
diff --git a/core/modes/modes.talon b/core/modes/command_and_dictation_mode.talon
similarity index 89%
rename from core/modes/modes.talon
rename to core/modes/command_and_dictation_mode.talon
index b2c4806a5e..6f8dba79ee 100644
--- a/core/modes/modes.talon
+++ b/core/modes/command_and_dictation_mode.talon
@@ -1,4 +1,5 @@
-not mode: sleep
+mode: command
+mode: dictation
 -
 ^dictation mode$:
     mode.disable("sleep")
diff --git a/core/modes/modes_dragon.talon b/core/modes/modes_dragon.talon
index 118c21a2f7..5e396893d7 100644
--- a/core/modes/modes_dragon.talon
+++ b/core/modes/modes_dragon.talon
@@ -1,5 +1,4 @@
-mode: sleep
-not mode: sleep
+mode: all
 speech.engine: dragon
 -
 # The optional <phrase> afterwards allows these to match even if you say arbitrary text
diff --git a/core/modes/modes_not_dragon.talon b/core/modes/modes_not_dragon.talon
index 4c6a078b6a..a537671cf2 100644
--- a/core/modes/modes_not_dragon.talon
+++ b/core/modes/modes_not_dragon.talon
@@ -1,5 +1,6 @@
+mode: command
+mode: dictation
 mode: sleep
-not mode: sleep
 not speech.engine: dragon
 -
 # The optional <phrase> afterwards allows these to match even if you say arbitrary text