diff --git a/ui/drivers/cocoa/ui_cocoa_window.m b/ui/drivers/cocoa/ui_cocoa_window.m
index 07b761c45e..78947caf38 100644
--- a/ui/drivers/cocoa/ui_cocoa_window.m
+++ b/ui/drivers/cocoa/ui_cocoa_window.m
@@ -28,11 +28,20 @@ void ui_window_cocoa_destroy(void *data)
 
 void ui_window_cocoa_set_focused(void *data)
 {
+    ui_window_cocoa_t *cocoa = (ui_window_cocoa_t*)data;
+    CocoaView *cocoa_view    = (CocoaView*)cocoa->data;
+    [[cocoa_view window] makeKeyAndOrderFront:nil];
 }
 
 void ui_window_cocoa_set_visible(void *data,
         bool set_visible)
 {
+    ui_window_cocoa_t *cocoa = (ui_window_cocoa_t*)data;
+    CocoaView *cocoa_view    = (CocoaView*)cocoa->data;
+    if (set_visible)
+        [[cocoa_view window] makeKeyAndOrderFront:nil];
+    else
+        [[cocoa_view window] orderOut:nil];
 }
 
 void ui_window_cocoa_set_title(void *data, char *buf)