diff --git a/src/window-event-handler.coffee b/src/window-event-handler.coffee
index 880b4f9e7..964e414c0 100644
--- a/src/window-event-handler.coffee
+++ b/src/window-event-handler.coffee
@@ -24,8 +24,13 @@ class WindowEventHandler
     @subscriptions.add listen(@document, 'submit', 'form', @handleFormSubmit)
 
     browserWindow = @applicationDelegate.getCurrentWindow()
-    browserWindow.on? 'enter-full-screen', @handleEnterFullScreen
-    browserWindow.on? 'leave-full-screen', @handleLeaveFullScreen
+    browserWindow.on 'enter-full-screen', @handleEnterFullScreen
+    @subscriptions.add new Disposable =>
+      browserWindow.removeListener('enter-full-screen', @handleEnterFullScreen)
+
+    browserWindow.on 'leave-full-screen', @handleLeaveFullScreen
+    @subscriptions.add new Disposable =>
+      browserWindow.removeListener('leave-full-screen', @handleLeaveFullScreen)
 
     @subscriptions.add @atomEnvironment.commands.add @window,
       'window:toggle-full-screen': @handleWindowToggleFullScreen