diff --git a/src/Surfaces/SurfaceManagerGui.cpp b/src/Surfaces/SurfaceManagerGui.cpp
index 4327606..3f00f73 100644
--- a/src/Surfaces/SurfaceManagerGui.cpp
+++ b/src/Surfaces/SurfaceManagerGui.cpp
@@ -166,8 +166,7 @@ void SurfaceManagerGui::mousePressed(ofMouseEventArgs & args){
 					if(surfaceManager->getSelectedSurface() != surfaceManager->getSurface(i)){
 						_cmdManager->exec(new SelSurfaceCmd(
 											  surfaceManager,
-											  surfaceManager->getSurface(i),
-											  &projectionEditor));
+											  surfaceManager->getSurface(i) ));
 					}
 
 					bSurfaceSelected = true;
@@ -231,6 +230,7 @@ void SurfaceManagerGui::setSurfaceManager(SurfaceManager * newSurfaceManager){
 	
 	ofAddListener(newSurfaceManager->vertexChangedEvent, this, &SurfaceManagerGui::onVertexChanged);
 	ofAddListener(newSurfaceManager->verticesChangedEvent, this, &SurfaceManagerGui::onVerticesChanged);
+	ofAddListener(newSurfaceManager->surfaceSelectedEvent, this, &SurfaceManagerGui::onSurfaceSelected);
 	
 	projectionEditor.setSurfaceManager(surfaceManager);
 	sourcesEditor.setSurfaceManager(surfaceManager);
@@ -341,5 +341,9 @@ void SurfaceManagerGui::onVerticesChanged(vector<ofVec3f> & vertices){
 	projectionEditor.createJoints();
 }
 
+void SurfaceManagerGui::onSurfaceSelected(int & surfaceIndex){
+	projectionEditor.createJoints();
+}
+
 } // namespace piMapper
 } // namespace ofx
\ No newline at end of file
diff --git a/src/Surfaces/SurfaceManagerGui.h b/src/Surfaces/SurfaceManagerGui.h
index 1cb6eb3..814649b 100644
--- a/src/Surfaces/SurfaceManagerGui.h
+++ b/src/Surfaces/SurfaceManagerGui.h
@@ -49,6 +49,7 @@ class SurfaceManagerGui {
 	
 		void onVertexChanged(ofVec3f & vertex);
 		void onVerticesChanged(vector<ofVec3f> & vertices);
+		void onSurfaceSelected(int & surfaceIndex);
 
 	private:
 		SurfaceManager * surfaceManager;