diff --git a/ba93af5b3e429db5a9c4dd7e2d06b800735a9071.patch b/ba93af5b3e429db5a9c4dd7e2d06b800735a9071.patch
new file mode 100644
index 0000000..25211b9
--- /dev/null
+++ b/ba93af5b3e429db5a9c4dd7e2d06b800735a9071.patch
@@ -0,0 +1,44 @@
+From ba93af5b3e429db5a9c4dd7e2d06b800735a9071 Mon Sep 17 00:00:00 2001
+From: Robert Roth <robert.roth.off@gmail.com>
+Date: Sun, 28 Mar 2021 20:33:40 +0300
+Subject: [PATCH] Dropped non-gnome workaround causing crash (fixes #182)
+
+---
+ src/interface.cpp | 14 --------------
+ 1 file changed, 14 deletions(-)
+
+diff --git a/src/interface.cpp b/src/interface.cpp
+index 48b42d0b..65e52682 100644
+--- a/src/interface.cpp
++++ b/src/interface.cpp
+@@ -698,7 +698,6 @@ create_main_window (GsmApplication *app)
+     GdkDisplay *display;
+     GdkMonitor *monitor;
+     GdkRectangle monitor_geometry;
+-    const char* session;
+ 
+     int width, height, xpos, ypos;
+ 
+@@ -715,19 +714,6 @@ create_main_window (GsmApplication *app)
+     gtk_application_window_set_help_overlay (GTK_APPLICATION_WINDOW (app->main_window),
+                                              GTK_SHORTCUTS_WINDOW (gtk_builder_get_object (builder, "help_overlay")));
+ 
+-    session = g_getenv ("XDG_CURRENT_DESKTOP");
+-    if (session && !strstr (session, "GNOME")){
+-        GtkBox *mainbox;
+-        HdyHeaderBar *headerbar;
+-
+-        mainbox = GTK_BOX (gtk_builder_get_object (builder, "main_box"));
+-        headerbar = HDY_HEADER_BAR (gtk_builder_get_object (builder, "header_bar"));
+-        gtk_style_context_remove_class (gtk_widget_get_style_context (GTK_WIDGET (headerbar)), "titlebar");
+-        gtk_window_set_titlebar (GTK_WINDOW (main_window), NULL);
+-        hdy_header_bar_set_show_close_button (headerbar, FALSE);
+-        gtk_box_pack_start (mainbox, GTK_WIDGET (headerbar), FALSE, FALSE, 0);
+-    }
+-
+     g_settings_get (app->settings->gobj(), GSM_SETTING_WINDOW_STATE, "(iiii)",
+                     &width, &height, &xpos, &ypos);
+     
+-- 
+GitLab
+
diff --git a/gnome-system-monitor.changes b/gnome-system-monitor.changes
index 4f9e46e..1846ae0 100644
--- a/gnome-system-monitor.changes
+++ b/gnome-system-monitor.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Apr 27 09:56:42 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Add ba93af5b3e429db5a9c4dd7e2d06b800735a9071.patch: Dropped
+  non-gnome workaround causing crash (boo#1185340).
+
 -------------------------------------------------------------------
 Sat Mar 20 09:19:23 UTC 2021 - Michael Gorse <mgorse@suse.com>
 
diff --git a/gnome-system-monitor.spec b/gnome-system-monitor.spec
index 475ac2b..d469629 100644
--- a/gnome-system-monitor.spec
+++ b/gnome-system-monitor.spec
@@ -24,6 +24,8 @@ License:        GPL-2.0-or-later
 Group:          System/GUI/GNOME
 URL:            https://wiki.gnome.org/Apps/SystemMonitor
 Source0:        https://download.gnome.org/sources/gnome-system-monitor/40/%{name}-%{version}.tar.xz
+# PATCH-FIX-UPSTREAM ba93af5b3e429db5a9c4dd7e2d06b800735a9071.patch boo#1185340 dimstar@opensuse.org -- Fix crash on non-GNOME desktops
+Patch0:         https://gitlab.gnome.org/GNOME/gnome-system-monitor/-/commit/ba93af5b3e429db5a9c4dd7e2d06b800735a9071.patch
 
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++