diff --git a/pyfpdb/HUD_main.pyw b/pyfpdb/HUD_main.pyw
index fd85d005..55fa7d93 100755
--- a/pyfpdb/HUD_main.pyw
+++ b/pyfpdb/HUD_main.pyw
@@ -282,6 +282,7 @@ class HUD_main(object):
                         table_name = "%s %s" % (tour_number, tab_number)
                     log.error("HUD create: table name %s not found, skipping." % table_name)
                 else:
+                    tablewindow.key = temp_key
                     tablewindow.max = max
                     tablewindow.site = site_name
                     # Test that the table window still exists
@@ -328,9 +329,9 @@ def idle_kill(hud_main, table):
     gtk.gdk.threads_enter()
     try:
         if table in hud_main.hud_dict:
-            hud_main.hud_dict[table].kill()
-            hud_main.hud_dict[table].main_window.destroy()
             hud_main.vb.remove(hud_main.hud_dict[table].tablehudlabel)
+            hud_main.hud_dict[table].main_window.destroy()
+            hud_main.hud_dict[table].kill()
             del(hud_main.hud_dict[table])
         hud_main.main_window.resize(1, 1)
     except:
diff --git a/pyfpdb/TableWindow.py b/pyfpdb/TableWindow.py
index a5e10670..2f13634f 100644
--- a/pyfpdb/TableWindow.py
+++ b/pyfpdb/TableWindow.py
@@ -124,13 +124,11 @@ class Table_Window(object):
             self.type = "tour"
             table_kwargs = dict(tournament = self.tournament, table_number = self.table)
             self.tableno_re = getTableNoRe(self.config, self.site, tournament = self.tournament)
-            self.key = tournament   # used as key for the hud_dict in HUD_main
         elif table_name is not None:
             self.name = table_name
             self.type = "cash"
             self.tournament = None
             table_kwargs = dict(table_name = table_name)
-            self.key = table_name
 
         else:
             return None
@@ -138,10 +136,7 @@ class Table_Window(object):
         self.search_string = getTableTitleRe(self.config, self.site, self.type, **table_kwargs)
         self.find_table_parameters()
 
-        try:
-            self.gdkhandle = gtk.gdk.window_foreign_new(self.number)
-        except AttributeError: # self.number does not exist, table was closed
-            return None
+#        self.gdkhandle = gtk.gdk.window_foreign_new(self.number)
         geo = self.get_geometry()
         if geo is None:  return None
         self.width  = geo['width']