diff --git a/ui-ngx/src/app/modules/home/components/dashboard/dashboard.component.html b/ui-ngx/src/app/modules/home/components/dashboard/dashboard.component.html
index 58dea3b6f6..c48030050d 100644
--- a/ui-ngx/src/app/modules/home/components/dashboard/dashboard.component.html
+++ b/ui-ngx/src/app/modules/home/components/dashboard/dashboard.component.html
@@ -63,7 +63,7 @@
   </mat-menu>
   <div [ngClass]="dashboardClass" id="gridster-background" style="height: auto; min-height: 100%; display: inline;">
     <gridster #gridster id="gridster-child" [options]="gridsterOpts">
-      <gridster-item [item]="widget" class="tb-noselect" *ngFor="let widget of dashboardWidgets">
+      <gridster-item [item]="widget" [ngClass]="{'tb-noselect': isEdit}" *ngFor="let widget of dashboardWidgets">
         <tb-widget-container
           [widget]="widget"
           [dashboardWidgets]="dashboardWidgets"
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/alarms-table-widget.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/alarms-table-widget.component.ts
index bfcfa65bd4..8f26727fb6 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/alarms-table-widget.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/alarms-table-widget.component.ts
@@ -697,12 +697,12 @@ export class AlarmsTableWidgetComponent extends PageComponent implements OnInit,
   }
 
   public onRowClick($event: Event, alarm: AlarmDataInfo) {
-    if ($event) {
-      $event.stopPropagation();
-    }
-    this.alarmsDatasource.toggleCurrentAlarm(alarm);
     const descriptors = this.ctx.actionsApi.getActionDescriptors('rowClick');
     if (descriptors.length) {
+      if ($event) {
+        $event.stopPropagation();
+      }
+      this.alarmsDatasource.toggleCurrentAlarm(alarm);
       let entityId;
       let entityName;
       if (alarm && alarm.originator) {
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/entities-table-widget.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/entities-table-widget.component.ts
index 0091a96d87..a0e2ca5704 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/entities-table-widget.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/entities-table-widget.component.ts
@@ -639,13 +639,13 @@ export class EntitiesTableWidgetComponent extends PageComponent implements OnIni
   }
 
   public onRowClick($event: Event, entity: EntityData, isDouble?: boolean) {
-    if ($event) {
-      $event.stopPropagation();
-    }
-    this.entityDatasource.toggleCurrentEntity(entity);
     const actionSourceId = isDouble ? 'rowDoubleClick' : 'rowClick';
     const descriptors = this.ctx.actionsApi.getActionDescriptors(actionSourceId);
     if (descriptors.length) {
+      if ($event) {
+        $event.stopPropagation();
+      }
+      this.entityDatasource.toggleCurrentEntity(entity);
       let entityId;
       let entityName;
       let entityLabel;
diff --git a/ui-ngx/src/app/modules/home/components/widget/widget.component.scss b/ui-ngx/src/app/modules/home/components/widget/widget.component.scss
index a269d569ae..0372773016 100644
--- a/ui-ngx/src/app/modules/home/components/widget/widget.component.scss
+++ b/ui-ngx/src/app/modules/home/components/widget/widget.component.scss
@@ -59,5 +59,13 @@
   #widget-container {
     min-height: 0;
     min-width: 0;
+
+    canvas {
+      user-select: none;
+
+      &::selection, &::-moz-selection {
+        background-color: transparent;
+      }
+    }
   }
 }
diff --git a/ui-ngx/src/app/modules/home/components/widget/widget.component.ts b/ui-ngx/src/app/modules/home/components/widget/widget.component.ts
index fea6e14291..dee17a000c 100644
--- a/ui-ngx/src/app/modules/home/components/widget/widget.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/widget.component.ts
@@ -759,7 +759,6 @@ export class WidgetComponent extends PageComponent implements OnInit, AfterViewI
         this.dynamicWidgetComponent = this.dynamicWidgetComponentRef.instance;
         this.widgetContext.$container = $(this.dynamicWidgetComponentRef.location.nativeElement);
         this.widgetContext.$container.css('display', 'block');
-        this.widgetContext.$container.css('user-select', 'none');
         this.widgetContext.$container.attr('id', 'container');
         if (this.widgetSizeDetected) {
           this.widgetContext.$container.css('height', this.widgetContext.height + 'px');