diff --git a/js/components/WindowManager.js b/js/components/WindowManager.js
index 7778fb21..db991f8b 100644
--- a/js/components/WindowManager.js
+++ b/js/components/WindowManager.js
@@ -166,9 +166,12 @@ class WindowManager extends React.Component {
       this.setState(stateDiff);
     };
 
-    window.addEventListener("mouseup", () => {
+    const removeListeners = () => {
       window.removeEventListener("mousemove", handleMouseMove);
-    });
+      window.removeEventListener("mouseup", removeListeners);
+    };
+
+    window.addEventListener("mouseup", removeListeners);
     window.addEventListener("mousemove", handleMouseMove);
   }