diff --git a/app/src/main/java/org/thoughtcrime/securesms/scribbles/ImageEditorHud.java b/app/src/main/java/org/thoughtcrime/securesms/scribbles/ImageEditorHud.java
index 69abd2a09d..014eb9b7f3 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/scribbles/ImageEditorHud.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/scribbles/ImageEditorHud.java
@@ -123,9 +123,9 @@ public final class ImageEditorHud extends LinearLayout {
   private void initializeVisibilityMap() {
     setVisibleViewsWhenInMode(Mode.NONE, drawButton, blurButton, textButton, stickerButton, cropButton, undoButton, saveButton);
 
-    setVisibleViewsWhenInMode(Mode.DRAW, confirmButton, undoButton, colorPicker, colorPalette);
+    setVisibleViewsWhenInMode(Mode.DRAW, confirmButton, undoButton, colorPicker, colorPalette, highlightButton);
 
-    setVisibleViewsWhenInMode(Mode.HIGHLIGHT, confirmButton, undoButton, colorPicker, colorPalette);
+    setVisibleViewsWhenInMode(Mode.HIGHLIGHT, confirmButton, undoButton, colorPicker, colorPalette, drawButton);
 
     setVisibleViewsWhenInMode(Mode.BLUR, confirmButton, undoButton, blurToggleHud);