diff --git a/atom/browser/native_window_views.cc b/atom/browser/native_window_views.cc
index f9dcd3a4c8f..05a72fbe559 100644
--- a/atom/browser/native_window_views.cc
+++ b/atom/browser/native_window_views.cc
@@ -720,6 +720,14 @@ gfx::ImageSkia NativeWindowViews::GetDevToolsWindowIcon() {
   return GetWindowAppIcon();
 }
 
+#if defined(USE_X11)
+void NativeWindowViews::GetDevToolsWindowWMClass(
+    std::string* name, std::string* class_name) {
+  *class_name = Browser::Get()->GetName();
+  *name = base::StringToLowerASCII(*class_name);
+}
+#endif
+
 void NativeWindowViews::HandleMouseDown() {
   // Hide menu bar when web view is clicked.
   if (menu_bar_autohide_ && menu_bar_visible_)
diff --git a/atom/browser/native_window_views.h b/atom/browser/native_window_views.h
index fe7df269173..97baa2a4630 100644
--- a/atom/browser/native_window_views.h
+++ b/atom/browser/native_window_views.h
@@ -113,6 +113,10 @@ class NativeWindowViews : public NativeWindow,
 
   // brightray::InspectableWebContentsDelegate:
   gfx::ImageSkia GetDevToolsWindowIcon() override;
+#if defined(USE_X11)
+  void GetDevToolsWindowWMClass(
+      std::string* name, std::string* class_name) override;
+#endif
 
   // content::WebContentsDelegate:
   void HandleMouseDown() override;
diff --git a/vendor/brightray b/vendor/brightray
index ddfebd06326..313defa8a49 160000
--- a/vendor/brightray
+++ b/vendor/brightray
@@ -1 +1 @@
-Subproject commit ddfebd06326a956145dfde6ed5f863396953da6d
+Subproject commit 313defa8a49c45250014e7c4ec2275d50dfd490d