diff --git a/src/gui/game/GameController.cpp b/src/gui/game/GameController.cpp
index 5cf2f4d08..b0c9e23f4 100644
--- a/src/gui/game/GameController.cpp
+++ b/src/gui/game/GameController.cpp
@@ -1455,9 +1455,7 @@ void GameController::Vote(int direction)
 
 void GameController::ChangeBrush()
 {
-	auto prev_size = gameModel->GetBrush().GetRadius();
 	gameModel->SetBrushID(gameModel->GetBrushID()+1);
-	gameModel->GetBrush().SetRadius(prev_size);
 }
 
 void GameController::ClearSim()
diff --git a/src/gui/game/GameModel.cpp b/src/gui/game/GameModel.cpp
index 6a6b86bfd..3c0e3c0ae 100644
--- a/src/gui/game/GameModel.cpp
+++ b/src/gui/game/GameModel.cpp
@@ -832,7 +832,9 @@ int GameModel::GetBrushID()
 
 void GameModel::SetBrushID(int i)
 {
+	auto prevRadius = brushList[currentBrush]->GetRadius();
 	currentBrush = i%brushList.size();
+	brushList[currentBrush]->SetRadius(prevRadius);
 	notifyBrushChanged();
 }