diff --git a/src/game/GameController.cpp b/src/game/GameController.cpp
index 7e5d93051..e39b47b2b 100644
--- a/src/game/GameController.cpp
+++ b/src/game/GameController.cpp
@@ -587,7 +587,8 @@ void GameController::SetActiveTool(int toolSelection, Tool * tool)
 
 void GameController::OpenSearch()
 {
-	search = new SearchController(new SearchCallback(this));
+	if(!search)
+		search = new SearchController(new SearchCallback(this));
 	ui::Engine::Ref().ShowWindow(search->GetView());
 }
 
diff --git a/src/search/SearchController.cpp b/src/search/SearchController.cpp
index 14d7e726b..13a252a26 100644
--- a/src/search/SearchController.cpp
+++ b/src/search/SearchController.cpp
@@ -76,7 +76,7 @@ void SearchController::Exit()
 	}
 	if(callback)
 		callback->ControllerExit();
-	HasExited = true;
+	//HasExited = true;
 }
 
 SearchController::~SearchController()