diff --git a/atom/browser/native_window_mac.mm b/atom/browser/native_window_mac.mm
index 72dd45728f15..30cc66d6f287 100644
--- a/atom/browser/native_window_mac.mm
+++ b/atom/browser/native_window_mac.mm
@@ -1672,8 +1672,12 @@ void NativeWindowMac::ToggleTabBar() {
 }
 
 void NativeWindowMac::AddTabbedWindow(NativeWindow* window) {
-  if ([window_ respondsToSelector:@selector(addTabbedWindow:ordered:)]) {
-    [window_ addTabbedWindow:window->GetNativeWindow() ordered:NSWindowAbove];
+  if (window_.get() == window->GetNativeWindow()) {
+    NSLog(@"Error: AddTabbedWindow cannot be called by a window on itself.");
+  } else {
+    if ([window_ respondsToSelector:@selector(addTabbedWindow:ordered:)]) {
+      [window_ addTabbedWindow:window->GetNativeWindow() ordered:NSWindowAbove];
+    }
   }
 }