diff --git a/package.json b/package.json
index 338653ad..9cbf6e01 100644
--- a/package.json
+++ b/package.json
@@ -163,7 +163,7 @@
   },
   "optionalDependencies": {
     "screen-snippet": "git+https://github.com/symphonyoss/ScreenSnippet2.git#v1.0.8",
-    "screen-share-indicator-frame": "git+https://github.com/symphonyoss/ScreenShareIndicatorFrame.git#v1.4.7",
+    "screen-share-indicator-frame": "git+https://github.com/symphonyoss/ScreenShareIndicatorFrame.git#v1.4.8",
     "swift-search": "2.0.2"
   },
   "ava": {
diff --git a/src/renderer/components/windows-title-bar.tsx b/src/renderer/components/windows-title-bar.tsx
index dbaa5073..7a7b7dc6 100644
--- a/src/renderer/components/windows-title-bar.tsx
+++ b/src/renderer/components/windows-title-bar.tsx
@@ -257,6 +257,7 @@ export default class WindowsTitleBar extends React.Component<{}, IState> {
     private updateTitleBar(): void {
         const { isFullScreen, titleBarHeight } = this.state;
         const contentWrapper = document.getElementById('content-wrapper');
+        const appView = document.getElementsByClassName('AppView-root-3')[0] as HTMLElement;
         const root = document.getElementById('root');
         const railContainer = document.getElementsByClassName('ReactRail-container-2')[0] as HTMLElement;
         const railList = document.getElementsByClassName('railList')[0] as HTMLElement;
@@ -271,10 +272,19 @@ export default class WindowsTitleBar extends React.Component<{}, IState> {
         }
 
         if (root) {
+            const rootChild = root.firstElementChild as HTMLElement;
+            if (rootChild && rootChild.style && rootChild.style.height === '100vh') {
+                rootChild.style.height = isFullScreen ? '100vh' : `calc(100vh - ${titleBarHeight})`;
+            }
+            root.style.height = isFullScreen ? '100vh' : `calc(100vh - ${titleBarHeight})`;
             root.style.marginTop = isFullScreen ? '0px' : titleBarHeight;
         } else if (contentWrapper) {
             contentWrapper.style.marginTop = isFullScreen ? '0px' : titleBarHeight;
         }
+
+        if (appView) {
+            appView.style.height = isFullScreen ? '100vh' : `calc(100vh - ${titleBarHeight})`;
+        }
         if (isFullScreen) {
             document.body.style.removeProperty('margin-top');
         }