diff --git a/src/ZenSidebarManager.mjs b/src/ZenSidebarManager.mjs index ea81268..c3ef31d 100644 --- a/src/ZenSidebarManager.mjs +++ b/src/ZenSidebarManager.mjs @@ -290,6 +290,9 @@ var gZenBrowserManagerSidebar = { _handleDragOver(event) {}, _handleDragEnter(event) { + if (typeof this.__dragingElement === 'undefined') { + return; + } const target = event.target; const elIndex = Array.prototype.indexOf.call(target.parentNode.children, target); if (elIndex < this.__dragingIndex) { diff --git a/src/ZenWorkspaces.mjs b/src/ZenWorkspaces.mjs index 364db3f..0745579 100644 --- a/src/ZenWorkspaces.mjs +++ b/src/ZenWorkspaces.mjs @@ -823,11 +823,13 @@ var ZenWorkspaces = { }, getContextIdIfNeeded(userContextId) { - if (typeof userContextId !== 'undefined' || !this.workspaceEnabled) { + const activeWorkspace = this.getActiveWorkspaceFromCache(); + const activeWorkspaceUserContextId = activeWorkspace?.containerTabId; + if ((typeof userContextId !== 'undefined' && userContextId !== activeWorkspaceUserContextId) + || !this.workspaceEnabled) { return [userContextId, false]; } - const activeWorkspace = this.getActiveWorkspaceFromCache(); - return [activeWorkspace?.containerTabId, true]; + return [activeWorkspaceUserContextId, true]; }, };