diff --git a/HTTPShortcuts/app/src/main/kotlin/ch/rmy/android/framework/ui/BaseActivity.kt b/HTTPShortcuts/app/src/main/kotlin/ch/rmy/android/framework/ui/BaseActivity.kt
index 0d965a4b5..b115c8df0 100644
--- a/HTTPShortcuts/app/src/main/kotlin/ch/rmy/android/framework/ui/BaseActivity.kt
+++ b/HTTPShortcuts/app/src/main/kotlin/ch/rmy/android/framework/ui/BaseActivity.kt
@@ -157,6 +157,7 @@ abstract class BaseActivity : AppCompatActivity() {
         if (currentDialogState == dialogState) {
             return
         }
+        logInfo("Setting dialog state: ${dialogState?.let { it.id ?: "no-id" } ?: "no dialog"}")
         currentDialog?.dismiss()
         currentDialogState = dialogState
         currentDialog = dialogState?.createDialog(context, viewModel)
diff --git a/HTTPShortcuts/app/src/main/kotlin/ch/rmy/android/framework/ui/BaseFragment.kt b/HTTPShortcuts/app/src/main/kotlin/ch/rmy/android/framework/ui/BaseFragment.kt
index 984769ef4..6abb0ab45 100644
--- a/HTTPShortcuts/app/src/main/kotlin/ch/rmy/android/framework/ui/BaseFragment.kt
+++ b/HTTPShortcuts/app/src/main/kotlin/ch/rmy/android/framework/ui/BaseFragment.kt
@@ -71,6 +71,7 @@ abstract class BaseFragment<Binding : ViewBinding> : Fragment() {
         if (currentDialogState == dialogState) {
             return
         }
+        logInfo("Setting dialog state: ${dialogState?.let { it.id ?: "no-id" } ?: "no dialog"}")
         currentDialog?.dismiss()
         currentDialogState = dialogState
         currentDialog = dialogState?.createDialog(requireContext(), viewModel)
diff --git a/HTTPShortcuts/app/src/main/kotlin/ch/rmy/android/http_shortcuts/activities/main/usecases/GetContextMenuDialogUseCase.kt b/HTTPShortcuts/app/src/main/kotlin/ch/rmy/android/http_shortcuts/activities/main/usecases/GetContextMenuDialogUseCase.kt
index 5eb7e9b21..292668634 100644
--- a/HTTPShortcuts/app/src/main/kotlin/ch/rmy/android/http_shortcuts/activities/main/usecases/GetContextMenuDialogUseCase.kt
+++ b/HTTPShortcuts/app/src/main/kotlin/ch/rmy/android/http_shortcuts/activities/main/usecases/GetContextMenuDialogUseCase.kt
@@ -10,7 +10,7 @@ class GetContextMenuDialogUseCase {
 
     @CheckResult
     operator fun invoke(shortcutId: String, title: String, isPending: Boolean, isMovable: Boolean, viewModel: ShortcutListViewModel) =
-        DialogState.create {
+        DialogState.create(DIALOG_ID) {
             title(title)
                 .item(R.string.action_place) {
                     viewModel.onPlaceOnHomeScreenOptionSelected(shortcutId)
@@ -47,4 +47,8 @@ class GetContextMenuDialogUseCase {
                 }
                 .build()
         }
+
+    companion object {
+        private const val DIALOG_ID = "shortcut-context-menu"
+    }
 }
diff --git a/HTTPShortcuts/app/src/main/kotlin/ch/rmy/android/http_shortcuts/activities/main/usecases/GetCurlExportDialogUseCase.kt b/HTTPShortcuts/app/src/main/kotlin/ch/rmy/android/http_shortcuts/activities/main/usecases/GetCurlExportDialogUseCase.kt
index 0671bb2aa..fba0dd672 100644
--- a/HTTPShortcuts/app/src/main/kotlin/ch/rmy/android/http_shortcuts/activities/main/usecases/GetCurlExportDialogUseCase.kt
+++ b/HTTPShortcuts/app/src/main/kotlin/ch/rmy/android/http_shortcuts/activities/main/usecases/GetCurlExportDialogUseCase.kt
@@ -13,7 +13,7 @@ import com.afollestad.materialdialogs.callbacks.onShow
 class GetCurlExportDialogUseCase {
 
     operator fun invoke(title: String, command: CurlCommand): DialogState =
-        DialogState.create {
+        DialogState.create(DIALOG_ID) {
             val curlCommand = CurlConstructor.toCurlCommandString(command)
             this
                 .title(title)
@@ -34,4 +34,8 @@ class GetCurlExportDialogUseCase {
     private fun copyCurlExport(context: Context, curlCommand: String) {
         ClipboardUtil.copyToClipboard(context, curlCommand)
     }
+
+    companion object {
+        private const val DIALOG_ID = "curl-export"
+    }
 }
diff --git a/HTTPShortcuts/app/src/main/kotlin/ch/rmy/android/http_shortcuts/activities/main/usecases/GetShortcutCreationDialogUseCase.kt b/HTTPShortcuts/app/src/main/kotlin/ch/rmy/android/http_shortcuts/activities/main/usecases/GetShortcutCreationDialogUseCase.kt
index 221f9af0d..69d66bb76 100644
--- a/HTTPShortcuts/app/src/main/kotlin/ch/rmy/android/http_shortcuts/activities/main/usecases/GetShortcutCreationDialogUseCase.kt
+++ b/HTTPShortcuts/app/src/main/kotlin/ch/rmy/android/http_shortcuts/activities/main/usecases/GetShortcutCreationDialogUseCase.kt
@@ -10,7 +10,7 @@ class GetShortcutCreationDialogUseCase {
 
     @CheckResult
     operator fun invoke(viewModel: MainViewModel): DialogState =
-        DialogState.create {
+        DialogState.create(DIALOG_ID) {
             title(R.string.title_create_new_shortcut_options_dialog)
                 .item(R.string.button_create_new) {
                     viewModel.onCreationDialogOptionSelected(ShortcutExecutionType.APP)
@@ -42,4 +42,8 @@ class GetShortcutCreationDialogUseCase {
                 }
                 .build()
         }
+
+    companion object {
+        private const val DIALOG_ID = "shortcut-creation"
+    }
 }
diff --git a/HTTPShortcuts/app/src/main/kotlin/ch/rmy/android/http_shortcuts/usecases/GetChangeLogDialogUseCase.kt b/HTTPShortcuts/app/src/main/kotlin/ch/rmy/android/http_shortcuts/usecases/GetChangeLogDialogUseCase.kt
index 52493bb40..3f2ea0cbf 100644
--- a/HTTPShortcuts/app/src/main/kotlin/ch/rmy/android/http_shortcuts/usecases/GetChangeLogDialogUseCase.kt
+++ b/HTTPShortcuts/app/src/main/kotlin/ch/rmy/android/http_shortcuts/usecases/GetChangeLogDialogUseCase.kt
@@ -89,7 +89,7 @@ class GetChangeLogDialogUseCase(
         }
 
     companion object {
-        const val DIALOG_ID = "change_log"
+        const val DIALOG_ID = "change-log"
 
         private const val CHANGELOG_ASSET_URL = "file:///android_asset/changelog.html"
     }