diff --git a/CHANGELOG b/CHANGELOG
index 650eda672d..625c58e493 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,9 @@
 devel
 -----
 
+* fixed internal issue #2567: the Web UI was showing the possibility to move a shard
+  from a follower to the current leader 
+
 * Bugfix: The AQL syntax variants `UPDATE/REPLACE k WITH d` now correctly take
   _rev from k instead of d (when ignoreRevs is false) and ignore d._rev.
 
diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/views/shardsView.js b/js/apps/system/_admin/aardvark/APP/frontend/js/views/shardsView.js
index 7a5d157dda..5298c22f5e 100644
--- a/js/apps/system/_admin/aardvark/APP/frontend/js/views/shardsView.js
+++ b/js/apps/system/_admin/aardvark/APP/frontend/js/views/shardsView.js
@@ -214,7 +214,7 @@
           });
 
           if (from) {
-            delete obj[leader];
+            delete obj[arangoHelper.getDatabaseShortName(leader)];
           }
 
           _.each(obj, function (value) {
diff --git a/js/apps/system/_admin/aardvark/APP/frontend/scss/_shards.scss b/js/apps/system/_admin/aardvark/APP/frontend/scss/_shards.scss
index 96f64344c4..e881878016 100644
--- a/js/apps/system/_admin/aardvark/APP/frontend/scss/_shards.scss
+++ b/js/apps/system/_admin/aardvark/APP/frontend/scss/_shards.scss
@@ -25,6 +25,12 @@
     margin-bottom: 1px;
   }
 
+  .sectionShardContent {
+    .pure-g {
+      width: auto;
+    }
+  }
+
   .shardSyncIcons {
     .fa {
       color: $c-warning;