1 files changed, 6 insertions, 1 deletions

diff --git a/components/kube/contents/ui/Kube.qml b/components/kube/contents/ui/Kube.qml
index c0aaad48..8839c78b 100644
--- a/components/kube/contents/ui/Kube.qml
+++ b/components/kube/contents/ui/Kube.qml
@@ -270,7 +270,12 @@ Controls2.ApplicationWindow {
             Kube.Listener {
                 filter: Kube.Messages.componentDone
                 onMessageReceived: {
-                    kubeViews.pop(Controls2.StackView.Immediate)
+                    //Return to the mailview if we try to pop everything off
+                    if (kubeViews.depth == 1) {
+                        kubeViews.setMailView()
+                    } else {
+                        kubeViews.pop(Controls2.StackView.Immediate)
+                    }
                     kubeViews.loginIfNecessary()
                 }
             }