diff --git a/writeas/AppDelegate.swift b/writeas/AppDelegate.swift
index 8e6fc95..49b2eef 100644
--- a/writeas/AppDelegate.swift
+++ b/writeas/AppDelegate.swift
@@ -13,8 +13,13 @@ class AppDelegate: NSObject, NSApplicationDelegate {
 
     var vc: ViewController?
 
-    func applicationDidFinishLaunching(aNotification: NSNotification) {
-        // Insert code here to initialize your application
+    @IBOutlet weak var nightModeItem: NSMenuItem!
+    
+    func applicationDidFinishLaunching(_ aNotification: Notification) {
+        nightModeItem.state = Int(UserDefaults.standard.string(forKey: "night_mode_state") ?? String(NSOffState))!
+        if nightModeItem.state == NSOnState {
+            vc?.toggle(isNight: true)
+        }
     }
 
     func applicationWillTerminate(_ aNotification: Notification) {
@@ -31,6 +36,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         let isOff = sender.state == NSOffState
         vc?.toggle(isNight: isOff)
         sender.state = isOff ? NSOnState : NSOffState
+        UserDefaults.standard.set(String(sender.state), forKey: "night_mode_state")
     }
 
     @IBAction func saveDocument(_ sender: AnyObject) {
diff --git a/writeas/Base.lproj/Main.storyboard b/writeas/Base.lproj/Main.storyboard
index ff74376..3ff0d6a 100644
--- a/writeas/Base.lproj/Main.storyboard
+++ b/writeas/Base.lproj/Main.storyboard
@@ -281,7 +281,11 @@
                         <outlet property="delegate" destination="Voe-Tx-rLC" id="PrD-fu-P6m"/>
                     </connections>
                 </application>
-                <customObject id="Voe-Tx-rLC" customClass="AppDelegate" customModule="Write_as" customModuleProvider="target"/>
+                <customObject id="Voe-Tx-rLC" customClass="AppDelegate" customModule="Write_as" customModuleProvider="target">
+                    <connections>
+                        <outlet property="nightModeItem" destination="jYO-0u-qN9" id="8xF-SV-B70"/>
+                    </connections>
+                </customObject>
                 <customObject id="Ady-hI-5gd" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
             </objects>
             <point key="canvasLocation" x="67" y="-252"/>