diff --git a/src/pane.js b/src/pane.js
index 118393227..943a12589 100644
--- a/src/pane.js
+++ b/src/pane.js
@@ -393,7 +393,6 @@ class Pane {
 
   // Called by the view layer to indicate that the pane has gained focus.
   focus () {
-    this.focused = true
     return this.activate()
   }
 
@@ -1011,6 +1010,8 @@ class Pane {
   // Public: Makes this pane the *active* pane, causing it to gain focus.
   activate () {
     if (this.isDestroyed()) throw new Error('Pane has been destroyed')
+    this.focused = true
+
     if (this.container) this.container.didActivatePane(this)
     this.emitter.emit('did-activate')
   }