diff --git a/src/gui/game/GameController.cpp b/src/gui/game/GameController.cpp
index 0191986b4..3eb759a2e 100644
--- a/src/gui/game/GameController.cpp
+++ b/src/gui/game/GameController.cpp
@@ -156,12 +156,12 @@ GameController::~GameController()
 	{
 		delete *iter;
 	}
+	delete commandInterface;
 	delete gameModel;
 	if (gameView->CloseActiveWindow())
 	{
 		delete gameView;
 	}
-	delete commandInterface;
 }
 
 void GameController::HistoryRestore()
diff --git a/src/lua/LuaWindow.cpp b/src/lua/LuaWindow.cpp
index 14d96d239..59b271bc7 100644
--- a/src/lua/LuaWindow.cpp
+++ b/src/lua/LuaWindow.cpp
@@ -492,7 +492,6 @@ void LuaWindow::ClearRef(LuaComponent *luaComponent)
 	auto it = grabbed_components.find(luaComponent);
 	if (it != grabbed_components.end())
 	{
-		window->RemoveComponent(luaComponent->GetComponent());
 		it->second.Clear();
 		it->first->owner_ref = it->second;
 		grabbed_components.erase(it);