diff --git a/src/app/app.ino b/src/app/app.ino
index 7087b91..8f1db3b 100644
--- a/src/app/app.ino
+++ b/src/app/app.ino
@@ -132,26 +132,16 @@ void loop()
   switch(evt)
   {
     case EventHandler::Event::FLASH_BUTTON_PRESS:
-      if(sab.getScreenManager().getEnabled())
-      {
-        sab.getScreenManager().displayNextView();
-        #ifdef DEBUG
-        Serial.printf("Changing view\nSelected view is : %d\n",sab.getScreenManager().getCurrentViewUID());
-        #endif
-      }
-      else
-        sab.getScreenManager().wakeUp();
+      sab.getScreenManager().displayNextView();
+      #ifdef DEBUG
+      Serial.printf("Changing view\nSelected view is : %d\n",sab.getScreenManager().getCurrentViewUID());
+      #endif
       break;
     case EventHandler::Event::FLASH_BUTTON_LONG_PRESS:
-      if(sab.getScreenManager().getEnabled())
-      {
-        sab.getScreenManager().displayPreviousView();
-        #ifdef DEBUG
-        Serial.printf("Changing view\nSelected view is : %d\n",sab.getScreenManager().getCurrentViewUID());
-        #endif
-      }
-      else
-        sab.getScreenManager().wakeUp();
+      sab.getScreenManager().displayPreviousView();
+      #ifdef DEBUG
+      Serial.printf("Changing view\nSelected view is : %d\n",sab.getScreenManager().getCurrentViewUID());
+      #endif
       break;
     default: //NO_EVENT
       break;