diff --git a/Fifth/resources/scripts/Standard/BuilderController.lua b/Fifth/resources/scripts/Standard/BuilderController.lua
index 3b7bf13..37f61b7 100644
--- a/Fifth/resources/scripts/Standard/BuilderController.lua
+++ b/Fifth/resources/scripts/Standard/BuilderController.lua
@@ -211,6 +211,9 @@ function BuilderController:onLoop()
     end
 
     if(self.isTiling) then
+        if (self.brush > table.getn(self.brushes)) do
+            self.brush = table.getn(self.brushes)
+        end
         tileSize = game.tileSize()
 
         if(self.mouseDown) then
@@ -291,4 +294,4 @@ end
 
 function create(parent, component)
     return BuilderController(parent, component)
-end
\ No newline at end of file
+end