diff --git a/ui/drivers/cocoa/cocoa_common.m b/ui/drivers/cocoa/cocoa_common.m
index c75b289c1f..26a0c6b17b 100644
--- a/ui/drivers/cocoa/cocoa_common.m
+++ b/ui/drivers/cocoa/cocoa_common.m
@@ -64,9 +64,10 @@ void *glkitview_init(void);
    
 #if defined(HAVE_COCOA)
    [self setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
-   ui_window_cocoa_t view;
-   view.data = (CocoaView*)self;
-   ui_window_cocoa_set_droppable(&view, true);
+   ui_window_cocoa_t cocoa_view;
+   cocoa_view.data = (CocoaView*)self;
+    
+   [self registerForDraggedTypes:[NSArray arrayWithObjects:NSColorPboardType, NSFilenamesPboardType, nil]];
 #elif defined(HAVE_COCOATOUCH)
    self.view = (__bridge GLKView*)glkitview_init();
    
diff --git a/ui/drivers/cocoa/ui_cocoa_window.m b/ui/drivers/cocoa/ui_cocoa_window.m
index 042846bcf4..cb0d3361e0 100644
--- a/ui/drivers/cocoa/ui_cocoa_window.m
+++ b/ui/drivers/cocoa/ui_cocoa_window.m
@@ -62,7 +62,7 @@ void ui_window_cocoa_set_droppable(void *data, bool droppable)
 
    if (droppable)
    {
-      [[cocoa_view window] registerForDraggedTypes:[NSArray arrayWithObject:NSFilenamesPboardType]];
+      [[cocoa_view window] registerForDraggedTypes:[NSArray arrayWithObjects:NSColorPboardType, NSFilenamesPboardType, nil]];
    }
    else
    {