diff --git a/src/org/thoughtcrime/securesms/scribbles/ImageEditorFragment.java b/src/org/thoughtcrime/securesms/scribbles/ImageEditorFragment.java
index 5862d5948..18114a68b 100644
--- a/src/org/thoughtcrime/securesms/scribbles/ImageEditorFragment.java
+++ b/src/org/thoughtcrime/securesms/scribbles/ImageEditorFragment.java
@@ -236,6 +236,8 @@ public final class ImageEditorFragment extends Fragment implements ImageEditorHu
       EditorElement element     = new EditorElement(renderer);
       imageEditorView.getModel().addElementCentered(element, 0.2f);
       currentSelection = element;
+    } else {
+      imageEditorHud.enterMode(ImageEditorHud.Mode.NONE);
     }
   }