diff --git a/application/dashlet.class.inc.php b/application/dashlet.class.inc.php
index b62d5d0d7..efdd6d3ef 100644
--- a/application/dashlet.class.inc.php
+++ b/application/dashlet.class.inc.php
@@ -1272,6 +1272,10 @@ abstract class DashletGroupBy extends Dashlet
 			$sBlockId = 'block_'.$this->sId.($bEditMode ? '_edit' : ''); // make a unique id (edition occuring in the same DOM)
 			$oBlock = new DisplayBlock($oFilter, $sType);
 			$oBlock->Display($oPage, $sBlockId, array_merge($aExtraParams, $aParams));
+			if($bEditMode)
+			{
+				$oPage->add('<div class="dashlet-blocker"></div>');
+			}
 			$oPage->add('</div>');
 		}
 	}
diff --git a/css/light-grey.css b/css/light-grey.css
index 5806d0a41..b038ff693 100644
--- a/css/light-grey.css
+++ b/css/light-grey.css
@@ -2134,6 +2134,17 @@ select#org_id {
   padding: 5px;
   margin: 0;
 }
+/* Prevent cursor clicking on the calendar (eg. While editing dashlet) */
+.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;
+}
 td.layout_cell {
   height: 50px;
   /* min-height does not work */
diff --git a/css/light-grey.scss b/css/light-grey.scss
index 65577c216..62150812a 100644
--- a/css/light-grey.scss
+++ b/css/light-grey.scss
@@ -2478,6 +2478,16 @@ select#org_id {
 	padding: 5px;
 	margin:0;
 }
+/* Prevent cursor clicking on the calendar (eg. While editing dashlet) */
+.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;
+}
 td.layout_cell {
 	height: 50px; /* min-height does not work */
 	vertical-align: top;