diff --git a/src/Application/ProjectionMappingState.cpp b/src/Application/ProjectionMappingState.cpp
index 16f6e6e..3dfd20c 100644
--- a/src/Application/ProjectionMappingState.cpp
+++ b/src/Application/ProjectionMappingState.cpp
@@ -173,6 +173,13 @@ void ProjectionMappingState::onKeyPressed(Application * app, ofKeyEventArgs & ar
 		 app->getCmdManager()->exec(new DeselectSurfaceCmd(app->getSurfaceManager()));
 		 break;
 		 
+	 case OF_KEY_TAB:
+		 app->getCmdManager()->exec(
+			new SetNextSourceCmd(
+				app->getSurfaceManager()->getSelectedSurface(),
+				app->getGui()->getSourcesEditor()));
+		 break;
+		 
 	 default:
 		 break;
 	}
diff --git a/src/Application/ProjectionMappingState.h b/src/Application/ProjectionMappingState.h
index dc04c89..22935d4 100644
--- a/src/Application/ProjectionMappingState.h
+++ b/src/Application/ProjectionMappingState.h
@@ -20,6 +20,7 @@
 #include "StartDragSurfaceCmd.h"
 #include "TogglePerspectiveCmd.h"
 #include "DeselectSurfaceCmd.h"
+#include "SetNextSourceCmd.h"
 #include "SurfaceType.h"
 #include "Gui.h"
 
diff --git a/src/Application/TextureMappingState.cpp b/src/Application/TextureMappingState.cpp
index 4ef45b2..f565dac 100644
--- a/src/Application/TextureMappingState.cpp
+++ b/src/Application/TextureMappingState.cpp
@@ -23,6 +23,7 @@ void TextureMappingState::onKeyPressed(Application * app, ofKeyEventArgs & args)
 		 app->getCmdManager()->exec(
 			 new SelNextTexCoordCmd(app->getGui()->getTextureEditor()));
 		 break;
+		 
 	 case '<':
 		 app->getCmdManager()->exec(
 			 new SelPrevTexCoordCmd(app->getGui()->getTextureEditor()));
@@ -32,6 +33,13 @@ void TextureMappingState::onKeyPressed(Application * app, ofKeyEventArgs & args)
 		 app->getCmdManager()->exec(
 			new DeselectTexCoordCmd(app->getGui()->getTextureEditor()));
 		 break;
+		 
+	 case OF_KEY_TAB:
+		 app->getCmdManager()->exec(
+			new SetNextSourceCmd(
+				app->getSurfaceManager()->getSelectedSurface(),
+				app->getGui()->getSourcesEditor()));
+		 break;
 	}
 	
 }
diff --git a/src/Application/TextureMappingState.h b/src/Application/TextureMappingState.h
index 12e37f5..08d72a2 100644
--- a/src/Application/TextureMappingState.h
+++ b/src/Application/TextureMappingState.h
@@ -7,6 +7,7 @@
 #include "SelNextTexCoordCmd.h"
 #include "SelPrevTexCoordCmd.h"
 #include "DeselectTexCoordCmd.h"
+#include "SetNextSourceCmd.h"
 
 namespace ofx {
 namespace piMapper {