diff --git a/src/Commands/SelNextSurfaceCmd.cpp b/src/Commands/SelNextSurfaceCmd.cpp
index bc18cb5..72ea110 100644
--- a/src/Commands/SelNextSurfaceCmd.cpp
+++ b/src/Commands/SelNextSurfaceCmd.cpp
@@ -8,13 +8,16 @@ SelNextSurfaceCmd::SelNextSurfaceCmd(SurfaceManager * surfaceManager){
 }
 
 void SelNextSurfaceCmd::exec(){
+	ofLogNotice("SelNextSurfaceCmd", "exec");
 	_prevSelectedSurface = _surfaceManager->getSelectedSurface();
+	_prevSelectedVertex = _surfaceManager->getSelectedVertexIndex();
 	_surfaceManager->selectNextSurface();
 }
 
 void SelNextSurfaceCmd::undo(){
 	ofLogNotice("SelNextSurfaceCmd", "undo");
 	_surfaceManager->selectSurface(_prevSelectedSurface);
+	_surfaceManager->selectVertex(_prevSelectedVertex);
 	_prevSelectedSurface = 0;
 }
 
diff --git a/src/Commands/SelNextSurfaceCmd.h b/src/Commands/SelNextSurfaceCmd.h
index ddd0538..3cbf7ff 100644
--- a/src/Commands/SelNextSurfaceCmd.h
+++ b/src/Commands/SelNextSurfaceCmd.h
@@ -22,6 +22,7 @@ class SelNextSurfaceCmd : public BaseUndoCmd {
 	private:
 		SurfaceManager * _surfaceManager;
 		BaseSurface * _prevSelectedSurface;
+		int _prevSelectedVertex;
 
 };