diff --git a/src/Application/States/ProjectionMappingState.cpp b/src/Application/States/ProjectionMappingState.cpp
index 8359436..4dda66e 100644
--- a/src/Application/States/ProjectionMappingState.cpp
+++ b/src/Application/States/ProjectionMappingState.cpp
@@ -26,11 +26,10 @@ void ProjectionMappingState::draw(Application * app){
 	app->getSurfaceManager()->draw();
 	ofPopStyle();
 	
-	app->getGui()->draw();
+	// TODO: Extract projection editor, make it a widget
+	app->getGui()->getProjectionEditor()->draw();
 	
-	/*
-		Draw scale widget. The size of the widget is being set on surface select.
-	*/
+	// Draw scale widget. The size of the widget is being set on surface select.
 	BaseSurface * selectedSurface = app->getSurfaceManager()->getSelectedSurface();
 	if(selectedSurface != 0){
 		Gui::instance()->getScaleWidget().draw();
diff --git a/src/Surfaces/SurfaceManagerGui.cpp b/src/Surfaces/SurfaceManagerGui.cpp
index 9100412..843301e 100644
--- a/src/Surfaces/SurfaceManagerGui.cpp
+++ b/src/Surfaces/SurfaceManagerGui.cpp
@@ -19,7 +19,7 @@ void SurfaceManagerGui::draw(){
 	if(guiMode == GuiMode::TEXTURE_MAPPING){
 		// TODO: Remove this if else together with the SurfaceManagerGui
 	}else if(guiMode == GuiMode::PROJECTION_MAPPING){
-		projectionEditor.draw();
+		//projectionEditor.draw();
 	}else if(guiMode == GuiMode::SOURCE_SELECTION){
 		sourcesEditor.draw();
 	}