diff --git a/app/Template/board/swimlane.php b/app/Template/board/swimlane.php
index 08efdd117..ec298e244 100644
--- a/app/Template/board/swimlane.php
+++ b/app/Template/board/swimlane.php
@@ -65,7 +65,7 @@
         <?php endif ?>
 
         <?php foreach ($column['tasks'] as $task): ?>
-            <?= $this->render($not_editable ? 'board/task_public' : 'board/task', array(
+            <?= $this->render($not_editable ? 'board/task_public' : 'board/task_private', array(
                 'project' => $project,
                 'task' => $task,
                 'categories' => $categories,
diff --git a/app/Template/board/task_menu.php b/app/Template/board/task_menu.php
new file mode 100644
index 000000000..e7e0f4199
--- /dev/null
+++ b/app/Template/board/task_menu.php
@@ -0,0 +1,13 @@
+<ul class="dropdown">
+    <li>
+        <a href="#" class="dropdown-menu"><?= '#'.$task['id'] ?></a>
+        <ul>
+            <li><i class="fa fa-user"></i> <?= $this->a(t('Change assignee'), 'board', 'changeAssignee', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'task-board-popover') ?></li>
+            <li><i class="fa fa-tag"></i> <?= $this->a(t('Change category'), 'board', 'changeCategory', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'task-board-popover') ?></li>
+            <li><i class="fa fa-align-left"></i> <?= $this->a(t('Change description'), 'task', 'description', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'task-board-popover') ?></li>
+            <li><i class="fa fa-comment-o"></i> <?= $this->a(t('Add a comment'), 'comment', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'task-board-popover') ?></li>
+            <li><i class="fa fa-pencil-square-o"></i> <?= $this->a(t('Edit this task'), 'task', 'edit', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'task-board-popover') ?></li>
+            <li><i class="fa fa-close"></i> <?= $this->a(t('Close this task'), 'task', 'close', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'redirect' => 'board'), false, 'task-board-popover') ?></li>
+        </ul>
+    </li>
+</ul>
\ No newline at end of file
diff --git a/app/Template/board/task.php b/app/Template/board/task_private.php
similarity index 58%
rename from app/Template/board/task.php
rename to app/Template/board/task_private.php
index f3014dfa8..efc5bacf8 100644
--- a/app/Template/board/task.php
+++ b/app/Template/board/task_private.php
@@ -6,27 +6,14 @@
      data-task-url="<?= $this->u('task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"
      title="<?= t('View this task') ?>">
 
+    <?= $this->render('board/task_menu', array('task' => $task)) ?>
+
     <div class="task-board-collapsed" style="display: none">
-        <?= $this->a('#'.$task['id'], 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'task-board-collapsed-id') ?>
         <?= $this->a($this->e($task['title']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'task-board-collapsed-title') ?>
     </div>
 
     <div class="task-board-expanded">
 
-        <ul class="dropdown">
-            <li>
-                <a href="#" class="dropdown-menu"><?= '#'.$task['id'] ?></a>
-                <ul>
-                    <li><i class="fa fa-user"></i> <?= $this->a(t('Change assignee'), 'board', 'changeAssignee', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'task-board-popover') ?></li>
-                    <li><i class="fa fa-tag"></i> <?= $this->a(t('Change category'), 'board', 'changeCategory', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'task-board-popover') ?></li>
-                    <li><i class="fa fa-align-left"></i> <?= $this->a(t('Change description'), 'task', 'description', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'task-board-popover') ?></li>
-                    <li><i class="fa fa-comment-o"></i> <?= $this->a(t('Add a comment'), 'comment', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'task-board-popover') ?></li>
-                    <li><i class="fa fa-pencil-square-o"></i> <?= $this->a(t('Edit this task'), 'task', 'edit', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'task-board-popover') ?></li>
-                    <li><i class="fa fa-close"></i> <?= $this->a(t('Close this task'), 'task', 'close', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'redirect' => 'board'), false, 'task-board-popover') ?></li>
-                </ul>
-            </li>
-        </ul>
-
         <?php if ($task['reference']): ?>
         <span class="task-board-reference" title="<?= t('Reference') ?>">
             (<?= $task['reference'] ?>)
diff --git a/assets/css/app.css b/assets/css/app.css
index 55b7383d3..7969bca59 100644
--- a/assets/css/app.css
+++ b/assets/css/app.css
@@ -749,7 +749,7 @@ nav .active a {
 /* board table */
 #board-container {
     overflow-x: scroll;
-    padding-bottom: 150px; /* Space to avoid dropdown menu truncated */
+    padding-bottom: 180px; /* Space to avoid dropdown menu truncated */
 }
 
 #board td,
diff --git a/assets/css/src/board.css b/assets/css/src/board.css
index 52f871f7a..6d7d8dd4a 100644
--- a/assets/css/src/board.css
+++ b/assets/css/src/board.css
@@ -17,7 +17,7 @@
 /* board table */
 #board-container {
     overflow-x: scroll;
-    padding-bottom: 150px; /* Space to avoid dropdown menu truncated */
+    padding-bottom: 180px; /* Space to avoid dropdown menu truncated */
 }
 
 #board td,