diff --git a/app/src/main/java/com/nextcloud/talk/conversation/CreateConversationDialogFragment.kt b/app/src/main/java/com/nextcloud/talk/conversation/CreateConversationDialogFragment.kt
index 017ccb6e0..ff68dfdbe 100644
--- a/app/src/main/java/com/nextcloud/talk/conversation/CreateConversationDialogFragment.kt
+++ b/app/src/main/java/com/nextcloud/talk/conversation/CreateConversationDialogFragment.kt
@@ -150,6 +150,15 @@ class CreateConversationDialogFragment : DialogFragment() {
                 conversationType
             )
         }
+
+        themeDialog()
+    }
+
+    private fun themeDialog() {
+        viewThemeUtils.platform.themeDialog(binding.root)
+        viewThemeUtils.platform.colorTextButtons((dialog as AlertDialog).getButton(AlertDialog.BUTTON_POSITIVE))
+        viewThemeUtils.platform.colorTextButtons((dialog as AlertDialog).getButton(AlertDialog.BUTTON_NEGATIVE))
+        viewThemeUtils.material.colorTextInputLayout(binding.textInputLayout)
     }
 
     private fun setupEmojiPopup() {
diff --git a/app/src/main/java/com/nextcloud/talk/conversation/RenameConversationDialogFragment.kt b/app/src/main/java/com/nextcloud/talk/conversation/RenameConversationDialogFragment.kt
index e9066c3c5..653455a64 100644
--- a/app/src/main/java/com/nextcloud/talk/conversation/RenameConversationDialogFragment.kt
+++ b/app/src/main/java/com/nextcloud/talk/conversation/RenameConversationDialogFragment.kt
@@ -118,6 +118,15 @@ class RenameConversationDialogFragment : DialogFragment() {
         positiveButton.setOnClickListener {
             viewModel.renameConversation(roomToken, binding.textEdit.text.toString())
         }
+
+        themeDialog()
+    }
+
+    private fun themeDialog() {
+        viewThemeUtils.platform.themeDialog(binding.root)
+        viewThemeUtils.platform.colorTextButtons((dialog as AlertDialog).getButton(AlertDialog.BUTTON_POSITIVE))
+        viewThemeUtils.platform.colorTextButtons((dialog as AlertDialog).getButton(AlertDialog.BUTTON_NEGATIVE))
+        viewThemeUtils.material.colorTextInputLayout(binding.textInputLayout)
     }
 
     private fun setupEmojiPopup() {