diff --git a/packages/designer/src/document/document-model.ts b/packages/designer/src/document/document-model.ts
index 22fe8d3c6..e92b5aae7 100644
--- a/packages/designer/src/document/document-model.ts
+++ b/packages/designer/src/document/document-model.ts
@@ -93,7 +93,7 @@ export class DocumentModel {
     this.rootNode?.getExtraProp('fileName', true)?.setValue(fileName);
   }
 
-  @computed get focusNode() {
+  get focusNode() {
     if (this._drillDownNode) {
       return this._drillDownNode;
     }
diff --git a/packages/shell/src/document-model.ts b/packages/shell/src/document-model.ts
index 3177f3b69..558a31c5f 100644
--- a/packages/shell/src/document-model.ts
+++ b/packages/shell/src/document-model.ts
@@ -89,7 +89,7 @@ export default class DocumentModel {
   }
 
   get focusNode(): Node {
-    return this._focusNode;
+    return this._focusNode || this.root;
   }
 
   set focusNode(node: Node) {