diff --git a/services/static-webserver/client/source/class/osparc/dashboard/WorkspaceHeader.js b/services/static-webserver/client/source/class/osparc/dashboard/WorkspaceHeader.js
index 4ef1576ee94..b4a567f5c48 100644
--- a/services/static-webserver/client/source/class/osparc/dashboard/WorkspaceHeader.js
+++ b/services/static-webserver/client/source/class/osparc/dashboard/WorkspaceHeader.js
@@ -159,14 +159,15 @@ qx.Class.define("osparc.dashboard.WorkspaceHeader", {
     __buildLayout: function(workspaceId) {
       this.getChildControl("icon");
       const title = this.getChildControl("title");
+
       this.getChildControl("edit-button").exclude();
+      this.resetAccessRights();
+      this.resetMyAccessRights();
 
       const workspace = osparc.store.Workspaces.getInstance().getWorkspace(workspaceId);
       if (workspaceId === -1) {
         this.__setIcon(osparc.store.Workspaces.iconPath(32));
         title.setValue(this.tr("Shared Workspaces"));
-        this.resetAccessRights();
-        this.resetMyAccessRights();
       } else if (workspace) {
         const thumbnail = workspace.getThumbnail();
         this.__setIcon(thumbnail ? thumbnail : osparc.store.Workspaces.iconPath(32));
@@ -176,8 +177,6 @@ qx.Class.define("osparc.dashboard.WorkspaceHeader", {
       } else {
         this.__setIcon("@FontAwesome5Solid/home/30");
         title.setValue(this.tr("My Workspace"));
-        this.resetAccessRights();
-        this.resetMyAccessRights();
       }
     },
 
diff --git a/services/static-webserver/client/source/class/osparc/desktop/StudyEditorIdlingTracker.js b/services/static-webserver/client/source/class/osparc/desktop/StudyEditorIdlingTracker.js
index fcabf9616ad..88b12f3669e 100644
--- a/services/static-webserver/client/source/class/osparc/desktop/StudyEditorIdlingTracker.js
+++ b/services/static-webserver/client/source/class/osparc/desktop/StudyEditorIdlingTracker.js
@@ -87,8 +87,13 @@ qx.Class.define("osparc.desktop.StudyEditorIdlingTracker", {
     },
 
     __startTimer: function() {
+      const inactivityThresholdT = osparc.Preferences.getInstance().getUserInactivityThreshold();
+      if (inactivityThresholdT === 0) {
+        // If 0, "Automatic Shutdown of Idle Instances" is disabled
+        return;
+      }
+
       const checkFn = () => {
-        const inactivityThresholdT = osparc.Preferences.getInstance().getUserInactivityThreshold();
         const flashMessageDurationS = Math.round(inactivityThresholdT * 0.2);
         this.__idlingTime++;