diff --git a/app/coffee/app.coffee b/app/coffee/app.coffee
index 3c55b4e2..934c85b6 100644
--- a/app/coffee/app.coffee
+++ b/app/coffee/app.coffee
@@ -126,7 +126,6 @@ modules = [
     "taigaSearch",
     "taigaAdmin",
     "taigaNavMenu",
-    "taigaLightboxes",
 
     # Vendor modules
     "ngRoute",
diff --git a/app/coffee/modules/lightboxes.coffee b/app/coffee/modules/common/lightboxes.coffee
similarity index 90%
rename from app/coffee/modules/lightboxes.coffee
rename to app/coffee/modules/common/lightboxes.coffee
index d9d09561..b848c062 100644
--- a/app/coffee/modules/lightboxes.coffee
+++ b/app/coffee/modules/common/lightboxes.coffee
@@ -19,13 +19,10 @@
 # File: modules/lightboxes.coffee
 ###
 
-
-# FIXME: this module should not be as the toplevel module.
-# It should be moved and to be part of taigaCommons module.
-module = angular.module("taigaLightboxes", [])
+module = angular.module("taigaCommon")
 
 
-BlockDirective = () ->
+BlockDirective = ->
     link = ($scope, $el, $attrs, $model) ->
         title = $attrs.title
         $el.find("h2.title").text(title)