diff --git a/packages/webapp/src/app.tsx b/packages/webapp/src/app.tsx
index 061a2ba7..1c4edb02 100644
--- a/packages/webapp/src/app.tsx
+++ b/packages/webapp/src/app.tsx
@@ -40,8 +40,8 @@ const App = (): ReactElement => {
                     defaultLocale={Locales.EN.code}
                     messages={locale.message as Record<string, string>}
                 >
-                    <CssBaseline />
                     <ThemeProvider theme={theme}>
+                        <CssBaseline />
                         <Router>
                             <Switch>
                                 <Route exact path="/">
@@ -72,8 +72,8 @@ const App = (): ReactElement => {
             </QueryClientProvider>
         </Provider>
     ) : (
-        <div>Loading ... </div>
-    );
+            <div>Loading ... </div>
+        );
 };
 
 export default App;
diff --git a/packages/webapp/src/theme/index.ts b/packages/webapp/src/theme/index.ts
index b64bdb9e..12055584 100644
--- a/packages/webapp/src/theme/index.ts
+++ b/packages/webapp/src/theme/index.ts
@@ -6,6 +6,7 @@ const theme = createMuiTheme({
             '@global': {
                 body: {
                     backgroundColor: 'white',
+                    minWidth: '800px'
                 },
             },
         },