diff --git a/SOURCES/fix-crash.patch b/SOURCES/fix-crash.patch
new file mode 100644
index 0000000..7c0b869
--- /dev/null
+++ b/SOURCES/fix-crash.patch
@@ -0,0 +1,38 @@
+From f82dcfe99dafc9b6eac331bcf22662c9254f8a40 Mon Sep 17 00:00:00 2001
+From: Edward Sheldrake <ejsheldrake@gmail.com>
+Date: Wed, 11 Apr 2012 08:27:16 +0100
+Subject: [PATCH] Fix assertion failed crash
+
+Fix "assertion failed: (last_slash != NULL)" crash while navigating the
+left tree view, fixed by having the model for the right list view emit
+all the row deleted signals before deleting any of its data.
+
+Fixes https://bugzilla.gnome.org/show_bug.cgi?id=670586
+---
+ src/gconf-list-model.c |    7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/src/gconf-list-model.c b/src/gconf-list-model.c
+index 27e1af6..4fc60f8 100644
+--- a/src/gconf-list-model.c
++++ b/src/gconf-list-model.c
+@@ -133,11 +133,14 @@ gconf_list_model_set_root_path (GConfListModel *model, const gchar *root_path)
+ 
+ 	if (model->root_path != NULL) {
+ 		for (list = model->values; list; list = list->next) {
++			model->stamp++;
++			gtk_tree_model_row_deleted (GTK_TREE_MODEL (model), path);
++		}
++
++		for (list = model->values; list; list = list->next) {
+ 			GConfEntry *entry = list->data;
+ 
+ 			g_hash_table_remove (model->key_hash, gconf_entry_get_key (entry));
+-			model->stamp++;
+-			gtk_tree_model_row_deleted (GTK_TREE_MODEL (model), path);
+ 
+ 			gconf_entry_unref (entry);
+ 		}
+-- 
+1.7.9.6
+
diff --git a/SPECS/gconf-editor.spec b/SPECS/gconf-editor.spec
index 409fd51..c5d1cf5 100644
--- a/SPECS/gconf-editor.spec
+++ b/SPECS/gconf-editor.spec
@@ -3,7 +3,7 @@
 Summary: Editor/admin tool for GConf
 Name: gconf-editor
 Version: 3.0.1
-Release: 7%{?dist}
+Release: 8%{?dist}
 URL: http://www.gnome.org
 #VCS: git:git://git.gnome.org/gconf-editor
 Source0: http://download.gnome.org/sources/gconf-editor/3.0/%{name}-%{version}.tar.xz
@@ -23,6 +23,7 @@ BuildRequires: gnome-doc-utils
 BuildRequires: intltool
 BuildRequires: gnome-common
 BuildRequires: autoconf automake libtool
+Patch0: fix-crash.patch
 
 %description
 gconf-editor allows you to browse and modify GConf configuration
@@ -30,6 +31,7 @@ sources.
 
 %prep
 %setup -q
+%patch0 -p1 -b .fix-crash
 
 %build
 %configure --disable-scrollkeeper
@@ -87,6 +89,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
 %dir %{_datadir}/omf/gconf-editor
 
 %changelog
+* Mon Mar 23 2015 Ray Strode <rstrode@redhat.com> 3.0.1-8
+- Fix crash
+  Resolves: #1141346
+
 * Fri Jan 24 2014 Daniel Mach <dmach@redhat.com> - 3.0.1-7
 - Mass rebuild 2014-01-24