diff --git a/src/main.tsx b/src/main.tsx
index 46106631..9d229864 100644
--- a/src/main.tsx
+++ b/src/main.tsx
@@ -318,7 +318,7 @@ class LineCmd extends React.Component<{sw : ScreenWindow, line : LineType, width
     }
 
     componentDidMount() {
-        this.componentDidUpdate();
+        this.componentDidUpdate(null, null, null);
     }
 
     componentWillUnmount() {
@@ -621,6 +621,7 @@ class TextAreaInput extends React.Component<{}, {}> {
             }
             if (e.code == "Escape") {
                 e.preventDefault();
+                e.stopPropagation();
                 let inputModel = GlobalModel.inputModel;
                 inputModel.toggleInfoMsg();
                 if (inputModel.inputMode.get() != null) {
diff --git a/src/types.ts b/src/types.ts
index efd62c0e..0950abe4 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -6,6 +6,7 @@ type SessionDataType = {
     notifynum : number,
     activescreenid : string,
     sessionidx : number,
+    archived? : boolean,
     screens : ScreenDataType[],
     remotes : RemoteInstanceType[],
 
@@ -43,6 +44,7 @@ type ScreenDataType = {
     screenidx : number,
     activewindowid : string,
     name : string,
+    archived? : boolean,
     windows : ScreenWindowType[],
     screenopts : ScreenOptsType,