diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp
index ccba7ee6ea..5d12c4984e 100644
--- a/src/displayapp/DisplayApp.cpp
+++ b/src/displayapp/DisplayApp.cpp
@@ -192,6 +192,10 @@ void DisplayApp::Refresh() {
       case Messages::GoToRunning:
         lcd.Wakeup();
         ApplyBrightness();
+        // reload main display app if we are notifications or quicksettings or app menu
+        if(currentApp == Apps::Launcher || currentApp == Apps::Notifications || currentApp == Apps::QuickSettings){
+          LoadApp(Apps::Clock, DisplayApp::FullRefreshDirections::Up);
+        }
         state = States::Running;
         break;
       case Messages::UpdateTimeOut:
@@ -376,6 +380,7 @@ void DisplayApp::LoadScreen(Apps app, DisplayApp::FullRefreshDirections directio
                                                        heartRateController,
                                                        motionController,
                                                        filesystem);
+      ReturnApp(Apps::Clock, FullRefreshDirections::Down, TouchEvents::SwipeDown); // We don't want to load a different app when in the clock
       break;
 
     case Apps::Error: