diff --git a/packages/desktop-client/src/components/App.js b/packages/desktop-client/src/components/App.js
index e4e9634639..19e2ea5f75 100644
--- a/packages/desktop-client/src/components/App.js
+++ b/packages/desktop-client/src/components/App.js
@@ -94,42 +94,45 @@ class App extends Component {
     return (
       <ResponsiveProvider>
         <div
-          key={hiddenScrollbars ? 'hidden-scrollbars' : 'scrollbars'}
-          {...css([
-            {
-              height: '100%',
-              backgroundColor: '#E8ECF0',
-              overflow: 'hidden',
-            },
-            styles.lightScrollbar,
-          ])}
+          style={{ height: '100%', display: 'flex', flexDirection: 'column' }}
         >
           {process.env.REACT_APP_REVIEW_ID && <DevelopmentTopBar />}
-
-          {fatalError ? (
-            <>
-              <AppBackground />
-              <FatalError error={fatalError} buttonText="Restart app" />
-            </>
-          ) : initializing ? (
-            <AppBackground
-              initializing={initializing}
-              loadingText={loadingText}
-            />
-          ) : budgetId ? (
-            <FinancesApp />
-          ) : (
-            <>
+          <div
+            key={hiddenScrollbars ? 'hidden-scrollbars' : 'scrollbars'}
+            {...css([
+              {
+                flexGrow: 1,
+                backgroundColor: '#E8ECF0',
+                overflow: 'hidden',
+              },
+              styles.lightScrollbar,
+            ])}
+          >
+            {fatalError ? (
+              <>
+                <AppBackground />
+                <FatalError error={fatalError} buttonText="Restart app" />
+              </>
+            ) : initializing ? (
               <AppBackground
                 initializing={initializing}
                 loadingText={loadingText}
               />
-              <ManagementApp isLoading={loadingText != null} />
-            </>
-          )}
+            ) : budgetId ? (
+              <FinancesApp />
+            ) : (
+              <>
+                <AppBackground
+                  initializing={initializing}
+                  loadingText={loadingText}
+                />
+                <ManagementApp isLoading={loadingText != null} />
+              </>
+            )}
 
-          <UpdateNotification />
-          <MobileWebMessage />
+            <UpdateNotification />
+            <MobileWebMessage />
+          </div>
         </div>
       </ResponsiveProvider>
     );
diff --git a/upcoming-release-notes/1267.md b/upcoming-release-notes/1267.md
new file mode 100644
index 0000000000..5229b1f7f3
--- /dev/null
+++ b/upcoming-release-notes/1267.md
@@ -0,0 +1,6 @@
+---
+category: Bugfix
+authors: [j-f1]
+---
+
+Fix the “Change server” button being invisible on Netlify deploy previews