diff --git a/android/app/src/main/kotlin/im/cwtch/flwtch/MainActivity.kt b/android/app/src/main/kotlin/im/cwtch/flwtch/MainActivity.kt
index 2663f54c..be363968 100644
--- a/android/app/src/main/kotlin/im/cwtch/flwtch/MainActivity.kt
+++ b/android/app/src/main/kotlin/im/cwtch/flwtch/MainActivity.kt
@@ -218,7 +218,7 @@ class MainActivity: FlutterActivity() {
         WorkManager.getInstance(this).enqueue(workRequest)
         WorkManager.getInstance(applicationContext).getWorkInfoByIdLiveData(workRequest.id).observe(
             this, Observer { workInfo ->
-                if (workInfo.state == WorkInfo.State.SUCCEEDED) {
+                if (workInfo != null && workInfo.state == WorkInfo.State.SUCCEEDED) {
                     val res = workInfo.outputData.keyValueMap.toString()
                     result.success(workInfo.outputData.getString("result"))
                 }
diff --git a/lib/views/globalsettingsview.dart b/lib/views/globalsettingsview.dart
index f7d040bd..3a1cd83d 100644
--- a/lib/views/globalsettingsview.dart
+++ b/lib/views/globalsettingsview.dart
@@ -140,6 +140,7 @@ class _GlobalSettingsViewState extends State<GlobalSettingsView> {
                           trailing: Container(
                               width: MediaQuery.of(context).size.width / 4,
                               child: DropdownButton(
+                                  isExpanded: true,
                                   value: settings.uiColumnModeLandscape.toString(),
                                   onChanged: (String? newValue) {
                                     settings.uiColumnModeLandscape = Settings.uiColumnModeFromString(newValue!);
@@ -197,6 +198,7 @@ class _GlobalSettingsViewState extends State<GlobalSettingsView> {
                         trailing: Container(
                             width: MediaQuery.of(context).size.width / 4,
                             child: DropdownButton(
+                                isExpanded: true,
                                 value: settings.notificationContent,
                                 onChanged: (NotificationContent? newValue) {
                                   settings.notificationContent = newValue!;