diff --git a/src/components/layout/AppLayout.js b/src/components/layout/AppLayout.js
index 66aef1730..746775a7f 100644
--- a/src/components/layout/AppLayout.js
+++ b/src/components/layout/AppLayout.js
@@ -43,6 +43,7 @@ const messages = defineMessages({
@observer
export default class AppLayout extends Component {
static propTypes = {
+ isFullScreen: PropTypes.bool.isRequired,
sidebar: PropTypes.element.isRequired,
services: PropTypes.element.isRequired,
children: PropTypes.element,
@@ -69,6 +70,7 @@ export default class AppLayout extends Component {
render() {
const {
+ isFullScreen,
sidebar,
services,
children,
@@ -90,7 +92,7 @@ export default class AppLayout extends Component {
return (
- {isWindows &&
}
+ {isWindows && !isFullScreen &&
}
{sidebar}
diff --git a/src/containers/layout/AppLayoutContainer.js b/src/containers/layout/AppLayoutContainer.js
index 075bd5e34..222ffdc1a 100644
--- a/src/containers/layout/AppLayoutContainer.js
+++ b/src/containers/layout/AppLayoutContainer.js
@@ -106,6 +106,7 @@ export default class AppLayoutContainer extends Component {
return (
{ this.isOnline = true; });
window.addEventListener('offline', () => { this.isOnline = false; });
+ mainWindow.on('enter-full-screen', () => { this.isFullScreen = true; });
+ mainWindow.on('leave-full-screen', () => { this.isFullScreen = false; });
+
+
this.isOnline = navigator.onLine;
// Check if Franz should launch on start
@@ -170,8 +178,6 @@ export default class AppStore extends Store {
this.actions.service.setActive({ serviceId });
- const mainWindow = remote.getCurrentWindow();
-
if (isWindows) {
mainWindow.restore();
} else if (isLinux) {