diff --git a/src/mac/YassAppDelegate.mm b/src/mac/YassAppDelegate.mm
index 60e8a716f..1cfa8604b 100644
--- a/src/mac/YassAppDelegate.mm
+++ b/src/mac/YassAppDelegate.mm
@@ -83,8 +83,7 @@ - (IBAction)OnOptionMenuClicked:(id)sender {
   NSStoryboard* storyboard = [NSStoryboard storyboardWithName:@"Main" bundle:nil];
   OptionViewController* optionViewController =
       (OptionViewController*)[storyboard instantiateControllerWithIdentifier:@"OptionViewController"];
-  YassViewController* viewController =
-      (YassViewController*)NSApplication.sharedApplication.mainWindow.contentViewController;
+  YassViewController* viewController = [YassViewController instance];
   [viewController presentViewControllerAsModalWindow:optionViewController];
 }
 
diff --git a/src/mac/YassWindowController.h b/src/mac/YassWindowController.h
index 9ed5f4e8b..4d2066fb2 100644
--- a/src/mac/YassWindowController.h
+++ b/src/mac/YassWindowController.h
@@ -13,7 +13,7 @@
 - (void)Started;
 - (void)StartFailed;
 - (void)Stopped;
-- (void)toggleDisplayStatus:(BOOL)enable;
+- (void)toggleDisplayStatus:(bool)enable;
 
 + (YassWindowController* __weak)instance;
 @end
diff --git a/src/mac/YassWindowController.mm b/src/mac/YassWindowController.mm
index d7e093f6e..0f3a4f437 100644
--- a/src/mac/YassWindowController.mm
+++ b/src/mac/YassWindowController.mm
@@ -20,7 +20,7 @@
 static YassWindowController* __weak _instance;
 
 @interface YassWindowController ()
-- (void)toggleDisplayStatusInternal:(BOOL)enable;
+- (void)toggleDisplayStatusInternal:(bool)enable;
 @end
 
 @implementation YassWindowController {
@@ -54,7 +54,7 @@ - (void)windowDidLoad {
   [y_status_bar_item_.button
       sendActionOn:NSEventMaskLeftMouseDown | NSEventMaskRightMouseDown | NSEventMaskOtherMouseDown];
 
-  BOOL enable_status_bar = absl::GetFlag(FLAGS_ui_display_realtime_status) ? TRUE : FALSE;
+  bool enable_status_bar = absl::GetFlag(FLAGS_ui_display_realtime_status);
   [self toggleDisplayStatusInternal:enable_status_bar];
 
   hide_on_closed_ = FALSE;
@@ -174,17 +174,17 @@ - (void)Stopped {
   [viewController Stopped];
 }
 
-- (void)toggleDisplayStatus:(BOOL)enable {
+- (void)toggleDisplayStatus:(bool)enable {
   [self toggleDisplayStatusInternal:enable];
-  absl::SetFlag(&FLAGS_ui_display_realtime_status, (enable == TRUE ? true : false));
+  absl::SetFlag(&FLAGS_ui_display_realtime_status, enable);
   config::SaveConfig();
 }
 
-- (void)toggleDisplayStatusInternal:(BOOL)enable {
+- (void)toggleDisplayStatusInternal:(bool)enable {
   if (enable && status_bar_item_ == nil) {
     status_bar_item_ = [[NSStatusBar systemStatusBar] statusItemWithLength:NSVariableStatusItemLength];
     [self UpdateStatusBar];
-  } else if (enable == FALSE && status_bar_item_ != nil) {
+  } else if (!enable && status_bar_item_ != nil) {
     status_bar_item_ = nil;
     status_bar_text_ = nil;
   }