diff --git a/lib/views/globalsettingsview.dart b/lib/views/globalsettingsview.dart
index 01f37db2..aa782034 100644
--- a/lib/views/globalsettingsview.dart
+++ b/lib/views/globalsettingsview.dart
@@ -93,20 +93,31 @@ class _GlobalSettingsViewState extends State<GlobalSettingsView> {
                                 );
                               }).toList())),
                       ListTile(
-                          title: Text(AppLocalizations.of(context)!.settingUIColumnLandscape, style: TextStyle(color: settings.current().mainTextColor())),
+                          title: Text(
+                            AppLocalizations.of(context)!.settingUIColumnLandscape,
+                            textWidthBasis: TextWidthBasis.longestLine,
+                            softWrap: true,
+                            style: TextStyle(color: settings.current().mainTextColor()),
+                          ),
                           leading: Icon(Icons.table_chart, color: settings.current().mainTextColor()),
-                          trailing: DropdownButton(
-                              value: settings.uiColumnModeLandscape.toString(),
-                              onChanged: (String? newValue) {
-                                settings.uiColumnModeLandscape = Settings.uiColumnModeFromString(newValue!);
-                                saveSettings(context);
-                              },
-                              items: Settings.uiColumnModeOptions(true).map<DropdownMenuItem<String>>((DualpaneMode value) {
-                                return DropdownMenuItem<String>(
-                                  value: value.toString(),
-                                  child: Text(Settings.uiColumnModeToString(value, context)),
-                                );
-                              }).toList())),
+                          trailing: Container(
+                              width: 200.0,
+                              child: DropdownButton(
+                                  isExpanded: true,
+                                  value: settings.uiColumnModeLandscape.toString(),
+                                  onChanged: (String? newValue) {
+                                    settings.uiColumnModeLandscape = Settings.uiColumnModeFromString(newValue!);
+                                    saveSettings(context);
+                                  },
+                                  items: Settings.uiColumnModeOptions(true).map<DropdownMenuItem<String>>((DualpaneMode value) {
+                                    return DropdownMenuItem<String>(
+                                      value: value.toString(),
+                                      child: Text(
+                                        Settings.uiColumnModeToString(value, context),
+                                        overflow: TextOverflow.ellipsis,
+                                      ),
+                                    );
+                                  }).toList()))),
                       SwitchListTile(
                         title: Text(AppLocalizations.of(context)!.blockUnknownLabel, style: TextStyle(color: settings.current().mainTextColor())),
                         subtitle: Text(AppLocalizations.of(context)!.descriptionBlockUnknownConnections),
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
         });
       },