diff --git a/src/pane-model.coffee b/src/pane-model.coffee
index f834ec3d5..4b0e518b2 100644
--- a/src/pane-model.coffee
+++ b/src/pane-model.coffee
@@ -62,7 +62,7 @@ class PaneModel extends Model
 
   isActive: -> @active
 
-  makeActive: -> @container.activePane = this
+  makeActive: -> @container?.activePane = this
 
   getPanes: -> [this]