diff --git a/src/UIShell/Content.svelte b/src/UIShell/Content.svelte
index 92668363..c492458b 100644
--- a/src/UIShell/Content.svelte
+++ b/src/UIShell/Content.svelte
@@ -3,6 +3,7 @@
   export let id = "main-content";
 
   import { Grid, Row, Column } from "../Grid";
+  import { shouldRenderHamburgerMenu } from "./navStore";
 </script>
 
 <div
@@ -17,7 +18,9 @@
     >
       <Grid narrow noGutter>
         <Row>
-          <Column lg="{{ span: 13, offset: 3 }}">
+          <Column
+            lg="{$shouldRenderHamburgerMenu ? { span: 13, offset: 3 } : {}}"
+          >
             <slot />
           </Column>
         </Row>
diff --git a/src/UIShell/SideNav.svelte b/src/UIShell/SideNav.svelte
index 9711e580..125d5521 100644
--- a/src/UIShell/SideNav.svelte
+++ b/src/UIShell/SideNav.svelte
@@ -55,8 +55,8 @@
   class:bx--side-nav__navigation="{true}"
   class:bx--side-nav="{true}"
   class:bx--side-nav--ux="{true}"
-  class:bx--side-nav--expanded="{isOpen}"
-  class:bx--side-nav--collapsed="{!isOpen}"
+  class:bx--side-nav--expanded="{isOpen && !rail}"
+  class:bx--side-nav--collapsed="{!isOpen && !rail}"
   class:bx--side-nav--rail="{rail}"
   {...$$restProps}
 >