diff --git a/app/coffee/modules/common/lightboxes.coffee b/app/coffee/modules/common/lightboxes.coffee
index 4cb8b372..74b65d3e 100644
--- a/app/coffee/modules/common/lightboxes.coffee
+++ b/app/coffee/modules/common/lightboxes.coffee
@@ -44,9 +44,8 @@ class LightboxService extends taiga.Service
 
         @animationFrame.add ->
             $el.addClass("open")
-
-        @animationFrame.add ->
-            $el.find('input,textarea').first().focus()
+            $el.one "transitionend", =>
+              $el.find('input,textarea').first().focus()
 
         @animationFrame.add =>
             lightboxContent.show()