diff --git a/app/src/ui/app-menu/app-menu.tsx b/app/src/ui/app-menu/app-menu.tsx
index 4f6288f3a8..73727c2fcb 100644
--- a/app/src/ui/app-menu/app-menu.tsx
+++ b/app/src/ui/app-menu/app-menu.tsx
@@ -202,4 +202,8 @@ export class AppMenu extends React.Component<IAppMenuProps, void> {
   public componentDidUpdate() {
     this.ensurePaneFocus()
   }
+
+  public componentWillUnmount() {
+    this.clearExpandCollapseTimer()
+  }
 }