diff --git a/ui-ngx/src/app/modules/home/components/dashboard-page/dashboard-page.component.ts b/ui-ngx/src/app/modules/home/components/dashboard-page/dashboard-page.component.ts
index 109d5f014b..5af1833794 100644
--- a/ui-ngx/src/app/modules/home/components/dashboard-page/dashboard-page.component.ts
+++ b/ui-ngx/src/app/modules/home/components/dashboard-page/dashboard-page.component.ts
@@ -1218,16 +1218,17 @@ export class DashboardPageComponent extends PageComponent implements IDashboardC
           return throwError(() => err);
         })
       ).subscribe((dashboard) => {
-        this.setEditMode(false, false);
-        this.dashboard = dashboard;
         if (reInitDashboard) {
           const dashboardPageInitData: DashboardPageInitData = {
             dashboard,
             currentDashboardId: dashboard.id ? dashboard.id.id : null,
-            widgetEditMode: false,
-            singlePageMode: false
+            widgetEditMode: this.widgetEditMode,
+            singlePageMode: this.singlePageMode
           };
           this.init(dashboardPageInitData);
+        } else {
+          this.dashboard = dashboard;
+          this.setEditMode(false, false);
         }
       });
     }
diff --git a/ui-ngx/src/app/modules/home/components/entity/entities-table.component.ts b/ui-ngx/src/app/modules/home/components/entity/entities-table.component.ts
index dd3e846d92..99b6275dfe 100644
--- a/ui-ngx/src/app/modules/home/components/entity/entities-table.component.ts
+++ b/ui-ngx/src/app/modules/home/components/entity/entities-table.component.ts
@@ -402,7 +402,7 @@ export class EntitiesTableComponent extends PageComponent implements IEntitiesTa
     this.cd.detectChanges();
   }
 
-  updateData(closeDetails: boolean = true) {
+  updateData(closeDetails: boolean = true, reloadEntity: boolean = true) {
     if (closeDetails) {
       this.isDetailsOpen = false;
     }
@@ -427,7 +427,7 @@ export class EntitiesTableComponent extends PageComponent implements IEntitiesTa
       timePageLink.endTime = interval.endTime;
     }
     this.dataSource.loadEntities(this.pageLink);
-    if (this.isDetailsOpen && this.entityDetailsPanel) {
+    if (reloadEntity && this.isDetailsOpen && this.entityDetailsPanel) {
       this.entityDetailsPanel.reloadEntity();
     }
   }
@@ -511,7 +511,7 @@ export class EntitiesTableComponent extends PageComponent implements IEntitiesTa
   }
 
   onEntityUpdated(entity: BaseData<HasId>) {
-    this.updateData(false);
+    this.updateData(false, false);
     this.entitiesTableConfig.entityUpdated(entity);
   }