diff --git a/app/src/main/java/com/nextcloud/talk/controllers/base/bottomnavigation/BottomNavigationController.java b/app/src/main/java/com/nextcloud/talk/controllers/base/bottomnavigation/BottomNavigationController.java index b7b6b232a..8efa2a098 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/base/bottomnavigation/BottomNavigationController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/base/bottomnavigation/BottomNavigationController.java @@ -287,7 +287,14 @@ public abstract class BottomNavigationController extends BaseController { */ Router childRouter = getChildRouter(currentlySelectedItemId); if (childRouter != null) { - return childRouter.handleBack(); + if (childRouter.getBackstackSize() > 1) { + return childRouter.handleBack(); + } else if (currentlySelectedItemId != R.id.navigation_calls) { + navigateTo(R.id.navigation_calls); + return true; + } else { + return false; + } } else { Log.d(TAG, "handleBack called with getChildRouter(currentlySelectedItemId) == null."); return false;