diff --git a/client/components/cards/labels.js b/client/components/cards/labels.js
index f84960fa4..4027076d7 100644
--- a/client/components/cards/labels.js
+++ b/client/components/cards/labels.js
@@ -67,7 +67,7 @@ BlazeComponent.extendComponent({
 
     // Disable drag-dropping if the current user is not a board member or is comment only
     this.autorun(() => {
-      if (Utils.isMiniScreen()) {
+      if (Utils.isMiniScreenOrShowDesktopDragHandles()) {
         $labels.sortable({
           handle: '.label-handle',
         });
@@ -79,7 +79,7 @@ BlazeComponent.extendComponent({
       {
         'click .js-select-label'(event) {
           const card = Utils.getCurrentCard();
-          const labelId = this._id;
+          const labelId = this.currentData()._id;
           card.toggleLabel(labelId);
           event.preventDefault();
         },
diff --git a/client/components/cards/labels.styl b/client/components/cards/labels.styl
index 38aea559d..aa00a28b7 100644
--- a/client/components/cards/labels.styl
+++ b/client/components/cards/labels.styl
@@ -225,3 +225,6 @@
 ul.edit-labels-pop-over
   span.fa.label-handle
     padding-right: 10px;
+
+  span.fa.label-handle + .card-label
+    max-width: 180px