diff --git a/apps/modes_gui b/apps/modes_gui
index f53d23d..ca44ced 100755
--- a/apps/modes_gui
+++ b/apps/modes_gui
@@ -407,10 +407,10 @@ class mainwindow(QtGui.QMainWindow):
 
     def on_quit(self):
         if self.running is True:
-            self._relay.close()
             self._radio.close()
-            self._relay = None
             self._radio = None
+            self._relay.close()
+            self._relay = None
             self._rps_timer = None
             try:
                 self.kmlgen.done = True
diff --git a/python/radio.py b/python/radio.py
index 8f50533..5f41c45 100644
--- a/python/radio.py
+++ b/python/radio.py
@@ -228,5 +228,7 @@ class modes_radio (gr.top_block, pubsub):
     print "Rate is %i" % (options.rate,)
 
   def close(self):
+    self.stop()
+    self.wait()
     self._sender.close()
     self._u = None