4 files changed, 20 insertions, 7 deletions
diff --git a/src/client/util/CurrentUserUtils.ts b/src/client/util/CurrentUserUtils.ts
index dd27f2dab..e8ecef231 100644
--- a/src/client/util/CurrentUserUtils.ts
+++ b/src/client/util/CurrentUserUtils.ts
@@ -558,7 +558,7 @@ export class CurrentUserUtils {
                     _width: 60,
                     _height: 60,
                     watchedDocuments,
-                    onClick: ScriptField.MakeScript(click, { scriptContext: "any" }), system: true
+                    onClick: ScriptField.MakeScript(click, { scriptContext: "any" })
                 }));
             const userDoc = menuBtns[menuBtns.length - 1];
             userDoc.userDoc = doc;
diff --git a/src/client/util/DocumentManager.ts b/src/client/util/DocumentManager.ts
index 67e05f8d0..637e219d5 100644
--- a/src/client/util/DocumentManager.ts
+++ b/src/client/util/DocumentManager.ts
@@ -10,6 +10,8 @@ import { LightboxView } from '../views/LightboxView';
 import { DocumentView, ViewAdjustment } from '../views/nodes/DocumentView';
 import { Scripting } from './Scripting';
 import { CurrentUserUtils } from './CurrentUserUtils';
+import { TabDocView } from '../views/collections/TabDocView';
+import { UndoManager } from './UndoManager';
 
 export class DocumentManager {
 
@@ -219,4 +221,12 @@ export class DocumentManager {
     }
 
 }
-Scripting.addGlobal(function DocFocus(doc: any) { DocumentManager.Instance.getDocumentViews(Doc.GetProto(doc)).map(view => view.props.focus(doc, { willZoom: true })); });
-\ No newline at end of file
+Scripting.addGlobal(function DocFocus(doc: any) {
+    const dv = DocumentManager.Instance.getDocumentView(doc);
+    if (dv && dv?.props.Document === doc) dv.props.focus(doc, { willZoom: true });
+    else {
+        const context = Cast(doc.context, Doc, null);
+        CollectionDockingView.AddSplit(context || doc, "right") && context &&
+            setTimeout(() => DocumentManager.Instance.getDocumentView(Doc.GetProto(doc))?.focus(doc));
+    }
+});
+\ No newline at end of file
diff --git a/src/client/util/DragManager.ts b/src/client/util/DragManager.ts
index 7b4d43793..19f1f8d15 100644
--- a/src/client/util/DragManager.ts
+++ b/src/client/util/DragManager.ts
@@ -13,7 +13,7 @@ import * as globalCssVariables from "../views/globalCssVariables.scss";
 import { UndoManager } from "./UndoManager";
 import { SnappingManager } from "./SnappingManager";
 
-export type dropActionType = "alias" | "copy" | "move" | "same" | "none" | undefined; // undefined = move
+export type dropActionType = "alias" | "copy" | "move" | "same" | "none" | undefined; // undefined = move, "same" = move but don't call removeDropProperties
 export function SetupDrag(
     _reference: React.RefObject<HTMLElement>,
     docFunc: () => Doc | Promise<Doc> | undefined,
diff --git a/src/client/util/UndoManager.ts b/src/client/util/UndoManager.ts
index 569ad8ab4..05fb9f378 100644
--- a/src/client/util/UndoManager.ts
+++ b/src/client/util/UndoManager.ts
@@ -148,12 +148,15 @@ export namespace UndoManager {
         }
     });
 
-    export function ClearTempBatch() {
-        tempEvents = undefined;
-    }
     export function RunInTempBatch<T>(fn: () => T) {
         tempEvents = [];
-        return runInAction(fn);
+        try {
+            const success = runInAction(fn);
+            if (!success) UndoManager.UndoTempBatch();
+            return success;
+        } finally {
+            tempEvents = undefined;
+        }
     }
     //TODO Make this return the return value
     export function RunInBatch<T>(fn: () => T, batchName: string) {