diff --git a/plugins/buildingplan.cpp b/plugins/buildingplan.cpp
index c23d15574..fadd723a7 100644
--- a/plugins/buildingplan.cpp
+++ b/plugins/buildingplan.cpp
@@ -431,7 +431,7 @@ struct buildingplan_query_hook : public df::viewscreen_dwarfmodest
 
     bool handleInput(set<df::interface_key> *input)
     {
-        if (!isInPlannedBuildingQueryMode())
+        if (!isInPlannedBuildingQueryMode() || Gui::inRenameBuilding())
             return false;
 
         initStatics();