diff --git a/src/Application/States/SourceSelectionState.cpp b/src/Application/States/SourceSelectionState.cpp
index 4223822..84d8c7f 100644
--- a/src/Application/States/SourceSelectionState.cpp
+++ b/src/Application/States/SourceSelectionState.cpp
@@ -18,7 +18,8 @@ void SourceSelectionState::draw(Application * app){
 	app->getSurfaceManager()->draw();
 	ofPopStyle();
 	
-	app->getGui()->draw();
+	// TODO: Separate SourcesEditor from SurfaceManagerGui, make it a widget
+	app->getGui()->getSourcesEditor()->draw();
 	
 	Gui::instance()->getSurfaceHighlightWidget().setSurfaceManager(app->getSurfaceManager());
 	Gui::instance()->getSurfaceHighlightWidget().draw();
diff --git a/src/Surfaces/SurfaceManagerGui.cpp b/src/Surfaces/SurfaceManagerGui.cpp
index 843301e..5e233b3 100644
--- a/src/Surfaces/SurfaceManagerGui.cpp
+++ b/src/Surfaces/SurfaceManagerGui.cpp
@@ -21,7 +21,7 @@ void SurfaceManagerGui::draw(){
 	}else if(guiMode == GuiMode::PROJECTION_MAPPING){
 		//projectionEditor.draw();
 	}else if(guiMode == GuiMode::SOURCE_SELECTION){
-		sourcesEditor.draw();
+		//sourcesEditor.draw();
 	}
 }