diff --git a/src/app/window-handler.ts b/src/app/window-handler.ts
index 81cacf62..575423ae 100644
--- a/src/app/window-handler.ts
+++ b/src/app/window-handler.ts
@@ -6,7 +6,7 @@ import * as path from 'path';
 import { format, parse } from 'url';
 
 import { apiName, WindowTypes } from '../common/api-interface';
-import { isDevEnv, isMac, isNodeEnv, isWindowsOS } from '../common/env';
+import { isDevEnv, isLinux, isMac, isNodeEnv, isWindowsOS } from '../common/env';
 import { i18n, LocaleType } from '../common/i18n';
 import { logger } from '../common/logger';
 import { getCommandLineArgs, getGuid } from '../common/utils';
@@ -612,6 +612,9 @@ export class WindowHandler {
                     if (type === 'window') {
                         const hwnd = source.id.split(':')[1];
                         this.execCmd(this.screenShareIndicatorFrameUtil, [ hwnd ]);
+                    } else if (isMac && type === 'screen') {
+                        const dispId = source.id.split(':')[1];
+                        this.execCmd(this.screenShareIndicatorFrameUtil, [ dispId ]);
                     }
                 }
             }
@@ -807,9 +810,9 @@ export class WindowHandler {
             displays.forEach((element) => {
                 if (displayId === element.id.toString()) {
                     logger.info(`window-handler: element:`, element);
-                    if (isWindowsOS || isMac) {
+                    if (isWindowsOS) {
                         this.execCmd(this.screenShareIndicatorFrameUtil, [ displayId ]);
-                    } else {
+                    } else if (isLinux) {
                         this.createScreenSharingFrameWindow('screen-sharing-frame',
                         element.workArea.width,
                         element.workArea.height,