diff --git a/scm-ui/ui-components/src/contexts/MenuContext.ts b/scm-ui/ui-components/src/contexts/MenuContext.ts
index fcd83ce801..83c292538e 100644
--- a/scm-ui/ui-components/src/contexts/MenuContext.ts
+++ b/scm-ui/ui-components/src/contexts/MenuContext.ts
@@ -3,7 +3,7 @@ import React from "react";
 const MENU_COLLAPSED = "secondary-menu-collapsed";
 
 export const MenuContext = React.createContext({
-  menuCollapsed: localStorage.getItem(MENU_COLLAPSED) === "true",
+  menuCollapsed: isMenuCollapsed(),
   setMenuCollapsed: (collapsed: boolean) => {}
 });
 
diff --git a/scm-ui/ui-components/src/repos/DiffFile.tsx b/scm-ui/ui-components/src/repos/DiffFile.tsx
index 09abcc6e5a..3cbd7020dc 100644
--- a/scm-ui/ui-components/src/repos/DiffFile.tsx
+++ b/scm-ui/ui-components/src/repos/DiffFile.tsx
@@ -106,7 +106,7 @@ class DiffFile extends React.Component<Props, State> {
       state => ({
         sideBySide: !state.sideBySide
       }),
-      () => callback(this.state.sideBySide ? this.state.sideBySide : false)
+      () => callback(true)
     );
   };