diff --git a/application/dashlet.class.inc.php b/application/dashlet.class.inc.php
index c137a5af9..ee57c4c60 100644
--- a/application/dashlet.class.inc.php
+++ b/application/dashlet.class.inc.php
@@ -1274,7 +1274,7 @@ abstract class DashletGroupBy extends Dashlet
 		$aExtraParams["panel_class"] = $sClass;
 		$oPanel = $oBlock->GetDisplay($oPage, $sBlockId, array_merge($aExtraParams, $aParams));
 		if ($bEditMode) {
-			$oPanel->AddHtml('<div class="dashlet-blocker"></div>');
+			$oPanel->AddHtml('<div class="ibo-dashlet-blocker dashlet-blocker"></div>');
 		}
 
 		return $oPanel;
diff --git a/css/backoffice/components/dashlet/_dashlet.scss b/css/backoffice/components/dashlet/_dashlet.scss
index 551213bcc..452c2557d 100644
--- a/css/backoffice/components/dashlet/_dashlet.scss
+++ b/css/backoffice/components/dashlet/_dashlet.scss
@@ -27,4 +27,13 @@ $ibo-dashlet--elements-spacing-y: 24px !default;
 }
 .ibo-details{
   margin-top: 5px;
+}
+.ibo-dashlet-blocker{
+  position: absolute;
+  z-index: 9; /* To be above calendar links & all, but below .close-box (9) */
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  cursor: not-allowed;
 }
\ No newline at end of file
diff --git a/css/backoffice/layout/dashboard/_dashboard-editor.scss b/css/backoffice/layout/dashboard/_dashboard-editor.scss
index e6fa28fb4..e322e3e29 100644
--- a/css/backoffice/layout/dashboard/_dashboard-editor.scss
+++ b/css/backoffice/layout/dashboard/_dashboard-editor.scss
@@ -103,4 +103,9 @@ $ibo-dashboard-editor--delete-dashlet-icon--z-index: 21 !default;
 	@extend .ibo-button;
 	@extend .ibo-is-alternative;
 	@extend .ibo-is-danger;
+}
+.ibo-dashboard-editor .itop-dashboard{
+  a{
+    cursor: not-allowed;
+  }
 }
\ No newline at end of file