diff --git a/app/coffee/app.coffee b/app/coffee/app.coffee
index 5e14f9ce..bc5b7ca4 100644
--- a/app/coffee/app.coffee
+++ b/app/coffee/app.coffee
@@ -39,7 +39,9 @@ taiga.sessionId = taiga.generateUniqueSessionIdentifier()
 
 
 configure = ($routeProvider, $locationProvider, $httpProvider, $provide, $tgEventsProvider,
-             $compileProvider, $translateProvider) ->
+             $compileProvider, $translateProvider, $animateProvider) ->
+
+    $animateProvider.classNameFilter(/^(?:(?!ng-animate-disabled).)*$/)
 
     # wait until the trasnlation is ready to resolve the page
     originalWhen = $routeProvider.when
@@ -646,6 +648,7 @@ module.config([
     "$tgEventsProvider",
     "$compileProvider",
     "$translateProvider",
+    "$animateProvider",
     configure
 ])
 
diff --git a/app/coffee/modules/related-tasks.coffee b/app/coffee/modules/related-tasks.coffee
index 81eda43b..b2a4595f 100644
--- a/app/coffee/modules/related-tasks.coffee
+++ b/app/coffee/modules/related-tasks.coffee
@@ -146,8 +146,14 @@ RelatedTaskCreateFormDirective = ($repo, $compile, $confirm, $tgmodel, $loading,
 
             return promise
 
-        render = ->
+        close = () ->
             $el.off()
+            $el.html("")
+
+            $scope.newRelatedTaskFormOpen = false
+
+        render = ->
+            $scope.newRelatedTaskFormOpen = true
 
             $el.html($compile(template())($scope))
             $el.find('input').focus().select()
@@ -158,14 +164,14 @@ RelatedTaskCreateFormDirective = ($repo, $compile, $confirm, $tgmodel, $loading,
                     createTask(newTask).then ->
                         render()
                 else if event.keyCode == 27
-                    $el.html("")
+                    $scope.$apply () -> close()
 
             $el.on "click", ".icon-delete", (event)->
-                $el.html("")
+                $scope.$apply () -> close()
 
             $el.on "click", ".icon-floppy", (event)->
                 createTask(newTask).then ->
-                    $el.html("")
+                    close()
 
         taiga.bindOnce $scope, "us", (val) ->
             newTask["status"] = $scope.project.default_task_status
@@ -185,7 +191,7 @@ module.directive("tgRelatedTaskCreateForm", ["$tgRepo", "$compile", "$tgConfirm"
 
 RelatedTaskCreateButtonDirective = ($repo, $compile, $confirm, $tgmodel) ->
     template = _.template("""
-        <a class="icon icon-plus related-tasks-buttons"></a>
+        <a ng-show="!newRelatedTaskFormOpen" class="icon icon-plus related-tasks-buttons ng-animate-disabled"></a>
     """)
 
     link = ($scope, $el, $attrs) ->
@@ -193,7 +199,7 @@ RelatedTaskCreateButtonDirective = ($repo, $compile, $confirm, $tgmodel) ->
             return if not val
             $el.off()
             if $scope.project.my_permissions.indexOf("add_task") != -1
-                $el.html(template())
+                $el.html($compile(template())($scope))
             else
                 $el.html("")