2 files changed, 7 insertions, 3 deletions
diff --git a/src/components/layout/AppLayout.js b/src/components/layout/AppLayout.js
index 5cfd66714..b2f1c9923 100644
--- a/src/components/layout/AppLayout.js
+++ b/src/components/layout/AppLayout.js
@@ -124,12 +124,16 @@ class AppLayout extends Component {
    const { intl } = this.props;
-    const { locked, automaticUpdates } = settings.app;
+    const { locked, automaticUpdates, showDragArea } = settings.app;
    if (locked) {
      return <LockedScreen />;
    }
    return (
+      <>
+      {isMac && !isFullScreen && showDragArea && (
+        <div className="window-draggable" />
+      )}
      <ErrorBoundary>
        <div className="app">
          {isWindows && !isFullScreen && (
@@ -138,7 +142,7 @@ class AppLayout extends Component {
              icon="assets/images/logo.svg"
            />
          )}
-          {isMac && !isFullScreen && (
+          {isMac && !isFullScreen && showDragArea && (
            <span
              onDoubleClick={toggleFullScreen}
              className={classes.titleBar}
@@ -207,6 +211,7 @@ class AppLayout extends Component {
          </div>
        </div>
      </ErrorBoundary>
+      </>
    );
  }
 }
diff --git a/src/index.html b/src/index.html
index eb42a1e8d..e50ec8777 100644
--- a/src/index.html
+++ b/src/index.html
@@ -14,7 +14,6 @@
    <script type="text/javascript" src="./app.js"></script>
  </head>
  <body>
-    <div class="window-draggable"></div>
    <div class="dev-warning">DEV MODE</div>
    <div id="root"></div>
    <div id="portalContainer"></div>