diff --git a/lib/views/groupsettingsview.dart b/lib/views/groupsettingsview.dart
index f1e50b95..a0149122 100644
--- a/lib/views/groupsettingsview.dart
+++ b/lib/views/groupsettingsview.dart
@@ -173,6 +173,7 @@ class _GroupSettingsViewState extends State<GroupSettingsView> {
         var handle = Provider.of<ContactInfoState>(context, listen: false).onion;
         Provider.of<FlwtchState>(context, listen: false).cwtch.LeaveGroup(profileOnion, handle);
         Future.delayed(Duration(milliseconds: 500), () {
+          Provider.of<AppState>(context, listen: false).selectedConversation = null;
           Navigator.of(context).popUntil((route) => route.settings.name == "conversations"); // dismiss dialog
         });
       },
diff --git a/lib/views/peersettingsview.dart b/lib/views/peersettingsview.dart
index cdcfc707..44de9d79 100644
--- a/lib/views/peersettingsview.dart
+++ b/lib/views/peersettingsview.dart
@@ -230,6 +230,7 @@ class _PeerSettingsViewState extends State<PeerSettingsView> {
         var handle = Provider.of<ContactInfoState>(context, listen: false).onion;
         Provider.of<FlwtchState>(context, listen: false).cwtch.LeaveConversation(profileOnion, handle);
         Future.delayed(Duration(milliseconds: 500), () {
+          Provider.of<AppState>(context, listen: false).selectedConversation = null;
           Navigator.of(context).popUntil((route) => route.settings.name == "conversations"); // dismiss dialog
         });
       },