Index: smart/interfaces/gtk/changes.py
===================================================================
--- smart/interfaces/gtk/changes.py	(revision 704)
+++ smart/interfaces/gtk/changes.py	(working copy)
@@ -65,6 +65,11 @@
         self._confirmbbox.set_layout(gtk.BUTTONBOX_END)
         self._vbox.pack_start(self._confirmbbox, expand=False)
 
+        self._cancelbutton = gtk.Button(stock="gtk-cancel")
+        self._cancelbutton.show()
+        self._cancelbutton.connect("clicked", lambda x: gtk.main_quit())
+        self._confirmbbox.pack_start(self._cancelbutton)
+
         self._okbutton = gtk.Button(stock="gtk-ok")
         self._okbutton.show()
         def clicked(x):
@@ -73,11 +78,6 @@
         self._okbutton.connect("clicked", clicked)
         self._confirmbbox.pack_start(self._okbutton)
 
-        self._cancelbutton = gtk.Button(stock="gtk-cancel")
-        self._cancelbutton.show()
-        self._cancelbutton.connect("clicked", lambda x: gtk.main_quit())
-        self._confirmbbox.pack_start(self._cancelbutton)
-
         self._closebbox = gtk.HButtonBox()
         self._closebbox.set_spacing(10)
         self._closebbox.set_layout(gtk.BUTTONBOX_END)
Index: smart/interfaces/gtk/channels.py
===================================================================
--- smart/interfaces/gtk/channels.py	(revision 704)
+++ smart/interfaces/gtk/channels.py	(working copy)
@@ -362,6 +362,11 @@
         bbox.show()
         vbox.pack_start(bbox, expand=False)
 
+        button = gtk.Button(stock="gtk-cancel")
+        button.show()
+        button.connect("clicked", lambda x: gtk.main_quit())
+        bbox.pack_start(button)
+
         button = gtk.Button(stock="gtk-ok")
         button.show()
         def clicked(x):
@@ -370,10 +375,6 @@
         button.connect("clicked", clicked)
         bbox.pack_start(button)
 
-        button = gtk.Button(stock="gtk-cancel")
-        button.show()
-        button.connect("clicked", lambda x: gtk.main_quit())
-        bbox.pack_start(button)
 
     def fill(self):
         self._treemodel.clear()
@@ -444,6 +445,11 @@
         bbox.show()
         vbox.pack_start(bbox, expand=False)
 
+        button = gtk.Button(stock="gtk-cancel")
+        button.show()
+        button.connect("clicked", lambda x: gtk.main_quit())
+        bbox.pack_start(button)
+
         button = gtk.Button(stock="gtk-ok")
         button.show()
         def clicked(x):
@@ -452,10 +458,6 @@
         button.connect("clicked", clicked)
         bbox.pack_start(button)
 
-        button = gtk.Button(stock="gtk-cancel")
-        button.show()
-        button.connect("clicked", lambda x: gtk.main_quit())
-        bbox.pack_start(button)
 
     def addField(self, key, label, value, ftype,
                  editable=True, tip=None, needed=False):
@@ -626,6 +628,11 @@
         bbox.show()
         vbox.pack_start(bbox, expand=False)
 
+        button = gtk.Button(stock="gtk-cancel")
+        button.show()
+        button.connect("clicked", lambda x: gtk.main_quit())
+        bbox.pack_start(button)
+
         self._ok = button = gtk.Button(stock="gtk-ok")
         button.show()
         def clicked(x):
@@ -634,10 +641,6 @@
         button.connect("clicked", clicked)
         bbox.pack_start(button)
 
-        button = gtk.Button(stock="gtk-cancel")
-        button.show()
-        button.connect("clicked", lambda x: gtk.main_quit())
-        bbox.pack_start(button)
 
     def show(self):
         self._typevbox.foreach(self._typevbox.remove)
@@ -721,6 +724,11 @@
         bbox.show()
         vbox.pack_start(bbox, expand=False)
 
+        button = gtk.Button(stock="gtk-cancel")
+        button.show()
+        button.connect("clicked", lambda x: gtk.main_quit())
+        bbox.pack_start(button)
+
         ok = button = gtk.Button(stock="gtk-ok")
         button.show()
         def clicked(x):
@@ -729,11 +737,6 @@
         button.connect("clicked", clicked)
         bbox.pack_start(button)
 
-        button = gtk.Button(stock="gtk-cancel")
-        button.show()
-        button.connect("clicked", lambda x: gtk.main_quit())
-        bbox.pack_start(button)
-
         radio = None
         self._method = None
         def method_toggled(button, method):