diff --git a/doric-android/doric/src/main/java/pub/doric/DoricPanelFragment.java b/doric-android/doric/src/main/java/pub/doric/DoricPanelFragment.java
index f65af747..adc9c57e 100644
--- a/doric-android/doric/src/main/java/pub/doric/DoricPanelFragment.java
+++ b/doric-android/doric/src/main/java/pub/doric/DoricPanelFragment.java
@@ -105,7 +105,11 @@ public class DoricPanelFragment extends Fragment implements IDoricNavigator {
 
     @Override
     public void pop() {
-        getNavController().popBackStack();
+        if (!getNavController().popBackStack()) {
+            if (getActivity() != null) {
+                getActivity().finish();
+            }
+        }
     }
 
     private NavController getNavController() {