diff --git a/src/ofxPiMapper.cpp b/src/ofxPiMapper.cpp
index 0fb66bd..9ee6dad 100644
--- a/src/ofxPiMapper.cpp
+++ b/src/ofxPiMapper.cpp
@@ -41,9 +41,7 @@ void ofxPiMapper::eraseActivePreset(){
 }
 
 void ofxPiMapper::selectSurface(int i){
-	if(_application.getState() == ofx::piMapper::PresentationMode::instance()){
-		_application.getSurfaceManager()->selectSurface(i);
-	}
+	_application.getState()->selectSurface(&_application, i);
 }
 
 void ofxPiMapper::selectNextSurface(){