diff --git a/docs/changelog.txt b/docs/changelog.txt
index bac0d2848..99a7b0fc2 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -61,6 +61,7 @@ Template for new versions:
 ## Fixes
 - Core: properly reload scripts in mods when a world is unloaded and immediately loaded again
 - Core: fix text getting added to DFHack text entry widgets when Alt- or Ctrl- keys are hit
+- `orders`: prevent import/export overlay from appearing on the create workorder screen
 
 ## Misc Improvements
 - Surround DFHack-specific UI elements with square brackets instead of red-yellow blocks for better readability
diff --git a/library/modules/Gui.cpp b/library/modules/Gui.cpp
index a8941fee7..acd8d0107 100644
--- a/library/modules/Gui.cpp
+++ b/library/modules/Gui.cpp
@@ -215,6 +215,8 @@ DEFINE_GET_FOCUS_STRING_HANDLER(dwarfmode)
         case df::enums::info_interface_mode_type::WORK_ORDERS:
             if (game->main_interface.info.work_orders.conditions.open)
                 newFocusString += "/Conditions";
+            else if (game->main_interface.create_work_order.open)
+                newFocusString += "/Create";
             else
                 newFocusString += "/Default";
             break;
@@ -481,11 +483,6 @@ DEFINE_GET_FOCUS_STRING_HANDLER(dwarfmode)
         newFocusString += "/AssignUniform";
         focusStrings.push_back(newFocusString);
     }
-    if (game->main_interface.create_work_order.open) {
-        newFocusString = baseFocus;
-        newFocusString += "/CreateWorkOrder";
-        focusStrings.push_back(newFocusString);
-    }
     if (game->main_interface.hotkey.open) {
         newFocusString = baseFocus;
         newFocusString += "/Hotkey";