diff --git a/src/kernel/move.c b/src/kernel/move.c
index ed5aeb4c1..11aa94f86 100644
--- a/src/kernel/move.c
+++ b/src/kernel/move.c
@@ -1637,11 +1637,8 @@ buildingtype_exists(const region * r, const building_type * bt, boolean working)
   building *b;
 
   for (b = rbuildings(r); b; b = b->next) {
-    if (b->type == bt) {
-      if (b->size >= bt->maxsize) {
-        return true;
-      }
-    }
+    if (b->type == bt && b->size >= bt->maxsize && (!working || fval(b, BLD_WORKING)))
+      return true;
   }
 
   return false;