diff --git a/pyfpdb/HUD_main.pyw b/pyfpdb/HUD_main.pyw
index a2aefc0f..38d435bc 100644
--- a/pyfpdb/HUD_main.pyw
+++ b/pyfpdb/HUD_main.pyw
@@ -270,6 +270,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
diff --git a/pyfpdb/TableWindow.py b/pyfpdb/TableWindow.py
index ea2596de..1ee51650 100644
--- a/pyfpdb/TableWindow.py
+++ b/pyfpdb/TableWindow.py
@@ -126,13 +126,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 = "%s Table %s" % (tournament, str(self.table))
         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  # used as key for the hud_dict in HUD_main
 
         else:
             return None