diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/menus/component.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/menus/component.cljs
index 074baa58a..2dbc35ab5 100644
--- a/frontend/src/app/main/ui/workspace/sidebar/options/menus/component.cljs
+++ b/frontend/src/app/main/ui/workspace/sidebar/options/menus/component.cljs
@@ -159,7 +159,7 @@
           {:ref textarea-ref
            :id "annotation-textarea"
            :data-debug annotation
-           :auto-focus true
+           :auto-focus (or @editing? creating?)
            :maxLength 300
            :on-input autogrow
            :default-value annotation