diff --git a/browser/api/atom_api_dialog.cc b/browser/api/atom_api_dialog.cc
index 75d31d088fd..89b83ce9e2c 100644
--- a/browser/api/atom_api_dialog.cc
+++ b/browser/api/atom_api_dialog.cc
@@ -119,12 +119,21 @@ v8::Handle<v8::Value> ShowOpenDialog(const v8::Arguments &args) {
       !args[2]->IsNumber())    // properties
     return node::ThrowTypeError("Bad argument");
 
+  NativeWindow* native_window = NULL;
+  if (args[3]->IsObject()) {
+    Window* window = Window::Unwrap<Window>(args[3]->ToObject());
+    if (!window || !window->window())
+      return node::ThrowError("Invalid window");
+
+    native_window = window->window();
+  }
+
   std::string title(*v8::String::Utf8Value(args[0]));
   base::FilePath default_path(V8ValueToFilePath(args[1]));
   int properties = args[2]->IntegerValue();
 
   std::vector<base::FilePath> paths;
-  if (!file_dialog::ShowOpenDialog(NULL,
+  if (!file_dialog::ShowOpenDialog(native_window,
                                    title,
                                    default_path,
                                    properties,
diff --git a/browser/api/lib/dialog.coffee b/browser/api/lib/dialog.coffee
index 7011de205b3..760d633be0e 100644
--- a/browser/api/lib/dialog.coffee
+++ b/browser/api/lib/dialog.coffee
@@ -7,7 +7,13 @@ fileDialogProperties =
 messageBoxTypes = ['none', 'info', 'warning']
 
 module.exports =
-  showOpenDialog: (options) ->
+  showOpenDialog: (window, options, callback) ->
+    if window? and window.constructor isnt BrowserWindow
+      # Shift.
+      callback = options
+      options = window
+      window = null
+
     options = title: 'Open', properties: ['openFile'] unless options?
     options.properties = options.properties ? ['openFile']
     throw new TypeError('Properties need to be array') unless Array.isArray options.properties
@@ -19,7 +25,10 @@ module.exports =
     options.title = options.title ? ''
     options.defaultPath = options.defaultPath ? ''
 
-    binding.showOpenDialog options.title, options.defaultPath, properties
+    binding.showOpenDialog options.title,
+                           options.defaultPath,
+                           properties,
+                           window
 
   showSaveDialog: (window, options) ->
     throw new TypeError('Invalid window') unless window?.constructor is BrowserWindow