diff --git a/changelog.txt b/changelog.txt
index 7d91af061e..1ab83703dd 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -39,6 +39,7 @@ Template for new versions:
 - `fix/dry-buckets`: don't empty buckets for wells that are actively in use
 - `gui/unit-info-viewer`: skill progress bars now show correct XP thresholds for skills past Legendary+5
 - `caravan`: no longer incorrectly identify wood-based plant items and plant-based soaps as being ethically unsuitable for trading with the elves
+- `gui/design`: don't require an extra cancel input to exit or cancel designations
 
 ## Misc Improvements
 - `immortal-cravings`: goblins and other naturally non-eating/non-drinking races will now also satisfy their needs for eating and drinking
diff --git a/gui/design.lua b/gui/design.lua
index 22666d83fe..2279ec005a 100644
--- a/gui/design.lua
+++ b/gui/design.lua
@@ -143,9 +143,13 @@ RightClickOverlay.ATTRS{
 function RightClickOverlay:onInput(keys)
     if keys._MOUSE_R or keys.LEAVESCREEN then
         -- building mode
-        if uibs.selection_pos.x >= 0 then
-            uibs.selection_pos:clear()
-            return true
+        if dfhack.gui.matchFocusString('dwarfmode/Building/Placement',
+            dfhack.gui.getDFViewscreen(true))
+        then
+            if uibs.selection_pos.x >= 0 then
+                uibs.selection_pos:clear()
+                return true
+            end
         -- all other modes
         elseif selection_rect.start_x >= 0 then
             selection_rect.start_x = -30000