diff --git a/app/coffee/modules/common/lightboxes.coffee b/app/coffee/modules/common/lightboxes.coffee
index f270837d..c2f5e122 100644
--- a/app/coffee/modules/common/lightboxes.coffee
+++ b/app/coffee/modules/common/lightboxes.coffee
@@ -86,7 +86,10 @@ class LightboxKeyboardNavigationService extends taiga.Service
 
         # Key: enter
         if code == 13
-            activeElement.trigger("click")
+            if $el.find(".watcher-single").length == 1
+                $el.find('.watcher-single:first').trigger("click")
+            else
+                activeElement.trigger("click")
 
         # Key: down
         else if code == 40