diff --git a/qml/panes/PeerSettingsPane.qml b/qml/panes/PeerSettingsPane.qml
index 95a9349f..d83260d5 100644
--- a/qml/panes/PeerSettingsPane.qml
+++ b/qml/panes/PeerSettingsPane.qml
@@ -60,7 +60,14 @@ Opaque.SettingsList { // settingsPane
                 onClicked: {
                     gcd.savePeerSettings(txtOnion.text, txtDisplayName.text)
                     toolbar.setTitle(txtDisplayName.text)
+
+                    // FIXME this is kind of a hack as ideally we could just update the peer name
+                    // and have that change broadcast to each message - but there isn't an easy way to do that
+                    // with our current message model setup. As such we simply reset and reload the message pane
+                    gcd.broadcast("ResetMessagePane")
                     theStack.pane = theStack.messagePane
+                    mm.setHandle(txtOnion.text)
+                    gcd.loadMessagesPane(txtOnion.text)
                 }
             }
         }