diff --git a/application/include/sandbox2d.hpp b/application/include/sandbox2d.hpp
index 405224d..551a242 100755
--- a/application/include/sandbox2d.hpp
+++ b/application/include/sandbox2d.hpp
@@ -75,7 +75,7 @@ class Sandbox2DLayer : public OpenEngine::Layer
         bool StopRunning(OpenEngine::KeyPressedEvent& event)
         {
             if (event.GetKeyCode() == OE_KEY_ESCAPE) {
-                OpenEngine::Application::Get().StopRunning();
+                OpenEngine::Application::Get().Close();
 
                 return true;
             }
diff --git a/application/src/control_layer.cpp b/application/src/control_layer.cpp
index b44d12c..9d1a890 100644
--- a/application/src/control_layer.cpp
+++ b/application/src/control_layer.cpp
@@ -5,6 +5,7 @@
 
 ControlLayer::ControlLayer(OpenEngine::Ref<OpenEngine::Layer> layer)
     : active_layer(layer), OpenEngine::Layer("control_layer")
+//ControlLayer::ControlLayer()
 {
 }
 
@@ -55,12 +56,12 @@ bool ControlLayer::SwitchLayer(OpenEngine::KeyPressedEvent& event)
 bool ControlLayer::StopRunning(OpenEngine::KeyPressedEvent& event)
 {
     if (event.GetKeyCode() == OE_KEY_ESCAPE) {
-        OpenEngine::Application::Get().StopRunning();
+        OpenEngine::Application::Get().Close();
 
         return true;
     }
 
-    return false;
+    return true;
 }