diff --git a/ChangeLog b/ChangeLog
index 909af3a18..8d43311cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,7 @@ Core functionalities moved to plugins:
Improvements:
+* Do not show the checkbox "Show default swimlane" when there is no active swimlanes
* Append filters instead of replacing value for users and categories dropdowns
* Do not show empty swimlanes in public view
* Change swimlane layout to save space on the screen
diff --git a/app/Template/swimlane/index.php b/app/Template/swimlane/index.php
index 41ba788b7..95b462d8a 100644
--- a/app/Template/swimlane/index.php
+++ b/app/Template/swimlane/index.php
@@ -52,7 +52,9 @@
= $this->form->label(t('Rename'), 'default_swimlane') ?>
= $this->form->text('default_swimlane', $default_swimlane, array(), array('required', 'maxlength="50"')) ?>
- = $this->form->checkbox('show_default_swimlane', t('Show default swimlane'), 1, isset($default_swimlane['show_default_swimlane']) && $default_swimlane['show_default_swimlane'] == 1) ?>
+
+ = $this->form->checkbox('show_default_swimlane', t('Show default swimlane'), 1, isset($default_swimlane['show_default_swimlane']) && $default_swimlane['show_default_swimlane'] == 1) ?>
+