diff --git a/VimR/MainWindow.swift b/VimR/MainWindow.swift
index bd5cf168..923236d2 100644
--- a/VimR/MainWindow.swift
+++ b/VimR/MainWindow.swift
@@ -388,10 +388,7 @@ class MainWindow: NSObject,
   }
 
   fileprivate func addViews() {
-    let contentView = self.window.contentView!
-
-    contentView.addSubview(self.workspace)
-
+    self.window.contentView?.addSubview(self.workspace)
     self.workspace.autoPinEdgesToSuperviewEdges()
   }
 }