diff --git a/src/Application/Application.cpp b/src/Application/Application.cpp
index 02a2d46..f19915f 100644
--- a/src/Application/Application.cpp
+++ b/src/Application/Application.cpp
@@ -63,7 +63,9 @@ void Application::onKeyPressed(ofKeyEventArgs & args){
 	if(_keySequence.size() >= 3){
 		_keySequence = _keySequence.substr(_keySequence.size() - 3, 3);
 		if(_keySequence == "new"){
-			_cmdManager.exec(new ClearSurfacesCmd());
+			if(SurfaceStack::instance()->size()){
+				_cmdManager.exec(new ClearSurfacesCmd(getSurfaceManager()));
+			}
 			return;
 		}
 	}
diff --git a/src/Application/Application.h b/src/Application/Application.h
index f3bf50c..4bdafca 100644
--- a/src/Application/Application.h
+++ b/src/Application/Application.h
@@ -15,6 +15,7 @@
 #include "Info.h"
 
 #include "SurfaceManagerGui.h"
+#include "SurfaceStack.h"
 
 // TODO: To be removed.
 #include "GuiMode.h"