diff --git a/app/coffee/modules/feedback.coffee b/app/coffee/modules/feedback.coffee
index bfc4032f..5609a5c1 100644
--- a/app/coffee/modules/feedback.coffee
+++ b/app/coffee/modules/feedback.coffee
@@ -56,18 +56,23 @@ FeedbackDirective = ($lightboxService, $repo, $confirm, $loading, feedbackServic
 
         $el.on "submit", "form", submit
 
-        sendFeedbackCallback = ->
+        openLightbox = ->
             $scope.feedback = {}
             $lightboxService.open($el)
             $el.find("textarea").focus()
 
-        feedbackService.emiter.on "send", sendFeedbackCallback
-
         $scope.$on "$destroy", ->
-            emitter.off(feedbackService.emiter, sendFeedbackCallback)
             $el.off()
 
-    return {link:link}
+        openLightbox()
+
+    directive = {
+        link: link,
+        templateUrl: "common/lightbox-feedback.html"
+        scope: {}
+    }
+
+    return directive
 
 module.directive("tgLbFeedback", ["lightboxService", "$tgRepo", "$tgConfirm",
     "$tgLoading", "tgFeedback", FeedbackDirective])
diff --git a/app/index.jade b/app/index.jade
index a6acad80..b795b201 100644
--- a/app/index.jade
+++ b/app/index.jade
@@ -30,8 +30,6 @@ html(lang="en")
             include partials/includes/modules/lightbox-generic-loading
         div.lightbox.lightbox-search(tg-search-box)
             include partials/includes/modules/lightbox-search
-        div.lightbox.lightbox-feedback.lightbox-generic-form(tg-lb-feedback)
-            include partials/includes/modules/lightbox-feedback
 
         include partials/includes/modules/loader
 
diff --git a/app/modules/feedback/feedback-service.coffee b/app/modules/feedback/feedback-service.coffee
index c063f215..281b9925 100644
--- a/app/modules/feedback/feedback-service.coffee
+++ b/app/modules/feedback/feedback-service.coffee
@@ -1,8 +1,12 @@
 class FeedbackService extends taiga.Service
-    constructor: ->
-        @.emiter = new EventEmitter2()
+    @.$inject = ["tgLightboxFactory"]
+
+    constructor: (@lightboxFactory) ->
+
 
     sendFeedback: ->
-        @.emiter.emit("send")
+        @lightboxFactory.create("tg-lb-feedback", {
+            "class": "lightbox lightbox-feedback lightbox-generic-form"
+        })
 
 angular.module("taigaFeedback").service("tgFeedback", FeedbackService)
diff --git a/app/modules/projects/projects.service.coffee b/app/modules/projects/projects.service.coffee
index 65edc942..3a902431 100644
--- a/app/modules/projects/projects.service.coffee
+++ b/app/modules/projects/projects.service.coffee
@@ -33,7 +33,9 @@ class ProjectsService extends taiga.Service
         return @.projectsPromise
 
     newProject: ->
-        @lightboxFactory.create("tg-lb-create-project")
+        @lightboxFactory.create("tg-lb-create-project", {
+            "class": "wizard-create-project"
+        })
 
     bulkUpdateProjectsOrder: (sortData) ->
         @rs.projects.bulkUpdateOrder(sortData).then =>
diff --git a/app/modules/services/lightbox-factory.service.coffee b/app/modules/services/lightbox-factory.service.coffee
index 6605496a..cd5d885c 100644
--- a/app/modules/services/lightbox-factory.service.coffee
+++ b/app/modules/services/lightbox-factory.service.coffee
@@ -2,15 +2,17 @@ class LightboxFactory
     @.$inject = ["$rootScope", "$compile"]
     constructor: (@rootScope, @compile) ->
 
-    create: (name) ->
+    create: (name, attrs) ->
         scope = @rootScope.$new()
 
         elm = $("<div>")
             .attr(name, true)
             .attr("tg-bind-scope", true)
-            .addClass("wizard-create-project")
             .addClass("remove-on-close")
 
+        if attrs
+            elm.attr(attrs)
+
         html = @compile(elm)(scope)
 
         $(document.body).append(html)
diff --git a/app/partials/includes/modules/lightbox-feedback.jade b/app/partials/common/lightbox-feedback.jade
similarity index 100%
rename from app/partials/includes/modules/lightbox-feedback.jade
rename to app/partials/common/lightbox-feedback.jade