diff --git a/frontend/src/app/main/ui/ds/controls/combobox.cljs b/frontend/src/app/main/ui/ds/controls/combobox.cljs
index a43c1c8b76..8e3ceba5ce 100644
--- a/frontend/src/app/main/ui/ds/controls/combobox.cljs
+++ b/frontend/src/app/main/ui/ds/controls/combobox.cljs
@@ -184,7 +184,8 @@
                    (when (deref open*)
                      (dom/prevent-default event)
                      (handle-selection focused* selected* open*)
-                     (when (fn? on-change)
+                     (when (and (fn? on-change)
+                                (some? focused))
                        (on-change focused)))
 
                    (kbd/esc? event)