diff --git a/system-config-printer-compiz-rename.patch b/system-config-printer-compiz-rename.patch
new file mode 100644
index 0000000..97d95b9
--- /dev/null
+++ b/system-config-printer-compiz-rename.patch
@@ -0,0 +1,11 @@
+diff -up system-config-printer-1.2.5/system-config-printer.py.compiz-rename system-config-printer-1.2.5/system-config-printer.py
+--- system-config-printer-1.2.5/system-config-printer.py.compiz-rename	2010-12-02 16:15:00.656238304 +0000
++++ system-config-printer-1.2.5/system-config-printer.py	2010-12-02 16:15:13.265702866 +0000
+@@ -3076,6 +3076,7 @@ class GUI(GtkGUI, monitor.Watcher):
+         ids.append (cell.connect ('editing-canceled',
+                                  self.printer_name_edit_cancel))
+         self.rename_sigids = ids
++        self.dests_iconview.grab_focus ()
+ 
+     def printer_name_edited (self, cell, path, newname):
+         newname = newname.replace("/", "")
diff --git a/system-config-printer.spec b/system-config-printer.spec
index 5db41de..385aafb 100644
--- a/system-config-printer.spec
+++ b/system-config-printer.spec
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.2.5
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -20,6 +20,7 @@ Patch1: system-config-printer-InstallPrinterDrivers-debug.patch
 Patch2: system-config-printer-mfg-mdl.patch
 Patch3: system-config-printer-NPTLpdQueue.patch
 Patch4: system-config-printer-uint32.patch
+Patch5: system-config-printer-compiz-rename.patch
 Patch101: pysmbc-doczip.patch
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -92,6 +93,9 @@ printers.
 # Make sure InstallPrinterDrivers gets correctly typed values (bug #647270).
 %patch4 -p1 -b .uint32
 
+# Grab focus on the IconView after setting it editable (bug #650995).
+%patch5 -p1 -b .compiz-rename
+
 pushd pysmbc-%{pysmbc_version}
 %patch101 -p1 -b .doczip
 popd
@@ -215,6 +219,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Thu Dec  2 2010 Tim Waugh <twaugh@redhat.com> - 1.2.5-7
+- Grab focus on the IconView after setting it editable (bug #650995).
+
 * Fri Oct 29 2010 Tim Waugh <twaugh@redhat.com> - 1.2.5-6
 - Make sure InstallPrinterDrivers gets correctly typed values (bug #647270).