diff --git a/qml/main.qml b/qml/main.qml
index b2c17069..6678e9b2 100644
--- a/qml/main.qml
+++ b/qml/main.qml
@@ -129,12 +129,18 @@ ApplicationWindow {
                 onBack: { backFn() }
 
                 onRightMenu: {
+                    // If a group is selected....
                     if (gcd.selectedConversation.length == 32) {
                         theStack.pane = theStack.groupProfilePane
                         gcd.requestGroupSettings(gcd.selectedConversation)
                     } else {
-                        theStack.pane = theStack.userProfilePane
-                        gcd.requestPeerSettings(gcd.selectedConversation)
+                        // if a peer is selected..
+                        if (theStack.pane == theStack.userProfilePane) {
+                            theStack.pane = theStack.messagePane
+                        } else {
+                            theStack.pane = theStack.userProfilePane
+                            gcd.requestPeerSettings(gcd.selectedConversation)
+                        }
                     }
                 }
             }