diff --git a/src/renderer/components/dock/editor-panel.tsx b/src/renderer/components/dock/editor-panel.tsx
index bf57eb10ca..c52630a89d 100644
--- a/src/renderer/components/dock/editor-panel.tsx
+++ b/src/renderer/components/dock/editor-panel.tsx
@@ -48,6 +48,7 @@ export class EditorPanel extends React.Component<Props> {
 
   onResize = () => {
     this.editor.resize();
+    this.editor.focus();
   }
 
   onCursorPosChange = (pos: Ace.Point) => {
diff --git a/src/renderer/components/dock/terminal.ts b/src/renderer/components/dock/terminal.ts
index f0685c0255..f02fd478f2 100644
--- a/src/renderer/components/dock/terminal.ts
+++ b/src/renderer/components/dock/terminal.ts
@@ -152,6 +152,7 @@ export class Terminal {
   onResize = () => {
     if (!this.isActive) return;
     this.fitLazy();
+    this.focus();
   }
 
   onActivate = () => {