diff --git a/app/src/main/java/com/m57/hermescontrol/NavigationController.kt b/app/src/main/java/com/m57/hermescontrol/NavigationController.kt
index 2ba2cf79..9ab4e90a 100644
--- a/app/src/main/java/com/m57/hermescontrol/NavigationController.kt
+++ b/app/src/main/java/com/m57/hermescontrol/NavigationController.kt
@@ -21,6 +21,7 @@ object NavigationController {
     }
 
     fun goBack() {
-        backStack?.removeLastOrNull()
+        val stack = backStack ?: return
+        if (stack.size > 1) stack.removeLastOrNull()
     }
 }