diff --git a/main/displays/qrimportdisplay.h b/main/displays/qrimportdisplay.h
index 74c8ca2..11784bb 100644
--- a/main/displays/qrimportdisplay.h
+++ b/main/displays/qrimportdisplay.h
@@ -88,7 +88,7 @@ public:
         {
             tft.setTextColor(TFT_GREEN, TFT_BLACK);
             m_statuslabel.redraw("OK");
-            switchScreen<TMenu>();
+            popScreen();
         }
     }
 
@@ -102,7 +102,7 @@ public:
             using espgui::Button;
             case Button::Left:
                 if (!m_waitingForResult)
-                    switchScreen<TMenu>();
+                    popScreen();
                 else
                     ESP_LOGW(TAG, "tried to leave while waiting for result");
                 break;
diff --git a/main/displays/statusdisplay.h b/main/displays/statusdisplay.h
index e810b0d..469b9dc 100644
--- a/main/displays/statusdisplay.h
+++ b/main/displays/statusdisplay.h
@@ -4,7 +4,6 @@
 #include <esp_heap_caps.h>
 
 // 3rdparty lib includes
-#include <actions/switchscreenaction.h>
 #include <widgets/label.h>
 #include <widgets/progressbar.h>
 #include <espchrono.h>