diff --git a/src/Commands/SelSurfaceCmd.cpp b/src/Commands/SelSurfaceCmd.cpp
index 9c90de0..aa7a9a0 100644
--- a/src/Commands/SelSurfaceCmd.cpp
+++ b/src/Commands/SelSurfaceCmd.cpp
@@ -10,14 +10,14 @@ SelSurfaceCmd::SelSurfaceCmd(SurfaceManager * surfaceManager, BaseSurface * surf
 
 void SelSurfaceCmd::exec(){
 	_prevSelectedSurface = _surfaceManager->getSelectedSurface();
+	_prevSelectedVertex = _surfaceManager->getSelectedVertexIndex();
 	_surfaceManager->selectSurface(_surfaceToSelect);
 }
 
 void SelSurfaceCmd::undo(){
 	ofLogNotice("SelSurfaceCmd", "undo");
 	_surfaceManager->selectSurface(_prevSelectedSurface);
-	_surfaceToSelect = 0;
-	_prevSelectedSurface = 0;
+	_surfaceManager->selectVertex(_prevSelectedVertex);
 }
 
 } // namespace piMapper
diff --git a/src/Commands/SelSurfaceCmd.h b/src/Commands/SelSurfaceCmd.h
index 1ff2616..d00522f 100644
--- a/src/Commands/SelSurfaceCmd.h
+++ b/src/Commands/SelSurfaceCmd.h
@@ -23,6 +23,7 @@ class SelSurfaceCmd : public BaseUndoCmd {
 		BaseSurface * _surfaceToSelect;
 		SurfaceManager * _surfaceManager;
 		BaseSurface * _prevSelectedSurface;
+		int _prevSelectedVertex;
 
 };