diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/input/Editor.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/input/Editor.kt
index 0c4beb466059c60693d7ea10c39cf5c6066cb2e4..9c7fa8b34247c29594e864a772123751733c730d 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/input/Editor.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/input/Editor.kt
@@ -289,7 +289,7 @@ class Editor(
   private fun showColorChooser(
     activity: FragmentActivity, @StringRes title: Int, @ColorInt preselect: Int, f: (Int?) -> Unit
   ) {
-    var selectedColor: Int? = null
+    var selectedColor: Int? = preselect
     ColorChooserDialog.Builder(chatline.context, title)
       .customColors(intArrayOf(
         formatHandler.mircColors[0],
@@ -318,6 +318,10 @@ class Editor(
       .dynamicButtonColor(false)
       .allowUserColorInputAlpha(false)
       .callback(object : ColorChooserDialog.ColorCallback {
+        override fun onColorReset(dialog: ColorChooserDialog) {
+          selectedColor = null
+        }
+
         override fun onColorSelection(dialog: ColorChooserDialog, color: Int) {
           selectedColor = color
         }
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/ui/ColorChooserDialog.java b/app/src/main/java/de/kuschku/quasseldroid/util/ui/ColorChooserDialog.java
index 811ff4d82ff1ee3f0c2c7aa9c134f7654eabfb1f..ffe1a7f3ebba8253b5576f3160bc46400ffd4c95 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/ui/ColorChooserDialog.java
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/ui/ColorChooserDialog.java
@@ -341,6 +341,7 @@ public class ColorChooserDialog extends DialogFragment
                 subIndex(-1); // Do this to avoid ArrayIndexOutOfBoundsException
                 invalidate();
               } else {
+                builder.callback.onColorReset(ColorChooserDialog.this);
                 dialog.cancel();
               }
             }
@@ -574,6 +575,7 @@ public class ColorChooserDialog extends DialogFragment
   }
 
   public interface ColorCallback {
+    void onColorReset(@NonNull ColorChooserDialog dialog);
 
     void onColorSelection(@NonNull ColorChooserDialog dialog, @ColorInt int selectedColor);