diff --git a/src/browser/base/content/ZenUIManager.mjs b/src/browser/base/content/ZenUIManager.mjs
index daeaacb2d..f9fd3c5af 100644
--- a/src/browser/base/content/ZenUIManager.mjs
+++ b/src/browser/base/content/ZenUIManager.mjs
@@ -202,7 +202,7 @@ var gZenVerticalTabsManager = {
   get actualWindowButtons() {
     // we have multiple ".titlebar-buttonbox-container" in the DOM, because of the titlebar
     if (!this.__actualWindowButtons) {
-      this.__actualWindowButtons = AppConstants.platform === 'macosx' ?
+      this.__actualWindowButtons = (AppConstants.platform === 'macosx' || this.isWindowsStyledButtons) ?
           document.querySelector('.titlebar-buttonbox-container') : // TODO: test if it works 100% of the time
           document.querySelector('#nav-bar .titlebar-buttonbox-container');
     }
diff --git a/src/browser/base/zen-components/ZenProfileDialogUI.mjs b/src/browser/base/zen-components/ZenProfileDialogUI.mjs
index 09faa3232..cdc8f7c3b 100644
--- a/src/browser/base/zen-components/ZenProfileDialogUI.mjs
+++ b/src/browser/base/zen-components/ZenProfileDialogUI.mjs
@@ -49,11 +49,7 @@ var ZenProfileDialogUI = {
   },
 
   _openProfile(profile) {
-    SelectableProfileService.getProfile(
-      aEvent.target.getAttribute("profileid")
-    ).then(profile => {
-      SelectableProfileService.launchInstance(profile);
-    });
+    Services.startup.createInstanceWithProfile(profile);
   },
 
   _getProfilesSize(profiles) {
diff --git a/src/browser/base/zen-components/ZenWorkspaces.mjs b/src/browser/base/zen-components/ZenWorkspaces.mjs
index 9a62bdcf2..8e6029fac 100644
--- a/src/browser/base/zen-components/ZenWorkspaces.mjs
+++ b/src/browser/base/zen-components/ZenWorkspaces.mjs
@@ -430,11 +430,11 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
         let activeWorkspace = await this.getActiveWorkspace();
         if (!activeWorkspace) {
           activeWorkspace = workspaces.workspaces.find((workspace) => workspace.default);
-          this.activeWorkspace = activeWorkspace.uuid;
+          this.activeWorkspace = activeWorkspace?.uuid;
         }
         if (!activeWorkspace) {
           activeWorkspace = workspaces.workspaces[0];
-          this.activeWorkspace = activeWorkspace.uuid;
+          this.activeWorkspace = activeWorkspace?.uuid;
         }
         await this.changeWorkspace(activeWorkspace, true);
       }