diff --git a/src/app.js b/src/app.js
index 6eb1f5fe..f18a8b43 100644
--- a/src/app.js
+++ b/src/app.js
@@ -7,7 +7,7 @@ import { IntlProvider, addLocaleData } from 'react-intl';
 import en from 'react-intl/locale-data/en';
 import configureStore from './store';
 import Routes from './Routes';
-import { RoutesProvider } from './components';
+import { RoutesProvider, MobileFrame } from './components';
 import routesConfiguration from './routesConfiguration';
 import { flattenRoutes } from './util/routes';
 import localeData from './translations/en.json';
@@ -21,7 +21,9 @@ export const ClientApp = props => {
       <Provider store={store}>
         <RoutesProvider flattenedRoutes={flattenedRoutes}>
           <BrowserRouter>
-            <Routes />
+            <MobileFrame>
+              <Routes />
+            </MobileFrame>
           </BrowserRouter>
         </RoutesProvider>
       </Provider>
@@ -42,7 +44,9 @@ export const ServerApp = props => {
       <Provider store={store}>
         <RoutesProvider flattenedRoutes={flattenedRoutes}>
           <StaticRouter location={url} context={context}>
-            <Routes />
+            <MobileFrame>
+              <Routes />
+            </MobileFrame>
           </StaticRouter>
         </RoutesProvider>
       </Provider>
diff --git a/src/components/PageLayout/PageLayout.js b/src/components/PageLayout/PageLayout.js
index cf245cb4..e1f48658 100644
--- a/src/components/PageLayout/PageLayout.js
+++ b/src/components/PageLayout/PageLayout.js
@@ -4,7 +4,6 @@ import Helmet from 'react-helmet';
 import { withRouter } from 'react-router-dom';
 import { FormattedMessage } from 'react-intl';
 import { Topbar } from '../../containers';
-import { MobileFrame } from '../../components';
 
 const scrollToTop = () => {
   // Todo: this might need fine tuning later
@@ -37,23 +36,21 @@ class PageLayout extends Component {
     /* eslint-enable no-console */
 
     return (
-      <MobileFrame>
-        <div className={className}>
-          <Helmet title={title} />
-          {authInfoError
-            ? <div style={{ color: 'red' }}>
-                <FormattedMessage id="PageLayout.authInfoFailed" />
-              </div>
-            : null}
-          {logoutError
-            ? <div style={{ color: 'red' }}>
-                <FormattedMessage id="PageLayout.logoutFailed" />
-              </div>
-            : null}
-          <Topbar />
-          {children}
-        </div>
-      </MobileFrame>
+      <div className={className}>
+        <Helmet title={title} />
+        {authInfoError
+          ? <div style={{ color: 'red' }}>
+              <FormattedMessage id="PageLayout.authInfoFailed" />
+            </div>
+          : null}
+        {logoutError
+          ? <div style={{ color: 'red' }}>
+              <FormattedMessage id="PageLayout.logoutFailed" />
+            </div>
+          : null}
+        <Topbar />
+        {children}
+      </div>
     );
   }
 }