diff --git a/docs/changelog.txt b/docs/changelog.txt
index b4e66ff59..bdb1eaab9 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -40,6 +40,9 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 ## New Tweaks
 - `tweak` stone-status-all: adds an option to toggle the economic status of all stones
 
+## Fixes
+- `tweak` max-wheelbarrow: fixed conflict with building renaming
+
 ## Misc Improvements
 - `gui/room-list`: added support for ``Gui::getSelectedBuilding()``
 - `search`: added support for stone restrictions screen (under ``z``: Status)
diff --git a/plugins/tweak/tweaks/max-wheelbarrow.h b/plugins/tweak/tweaks/max-wheelbarrow.h
index 4df02abd2..a7af186ef 100644
--- a/plugins/tweak/tweaks/max-wheelbarrow.h
+++ b/plugins/tweak/tweaks/max-wheelbarrow.h
@@ -43,7 +43,7 @@ struct max_wheelbarrow_hook : df::viewscreen_dwarfmodest {
     {
         df::building_stockpilest* stockpile = getStockpile();
         bool handled = false;
-        if (stockpile)
+        if (stockpile && !Gui::inRenameBuilding())
         {
             handled = true;
             if (!in_wheelbarrow_entry &&
@@ -72,9 +72,8 @@ struct max_wheelbarrow_hook : df::viewscreen_dwarfmodest {
                 }
                 else
                 {
-                    for (auto iter = input->begin(); iter != input->end(); ++iter)
+                    for (df::interface_key key : *input)
                     {
-                        df::interface_key key = *iter;
                         if (key >= Screen::charToKey('0') && key <= Screen::charToKey('9') &&
                             wheelbarrow_entry.size() < 3)
                         {