diff --git a/glue/viewers/common/viewer.py b/glue/viewers/common/viewer.py
index b039d2416..cc2aa4b57 100644
--- a/glue/viewers/common/viewer.py
+++ b/glue/viewers/common/viewer.py
@@ -152,7 +152,6 @@ def __init__(self, session, state=None):
         # the current state of the viewer
         self.state = state or self._state_cls()
         self.state.data_collection = session.data_collection
-        self.state.title = self.state.title or self.LABEL
 
         # Create the layer artist container, which is the object in which
         # we will add LayerArtist objects
diff --git a/glue/viewers/table/qt/data_viewer.py b/glue/viewers/table/qt/data_viewer.py
index 3d7e7220e..722f0a41d 100644
--- a/glue/viewers/table/qt/data_viewer.py
+++ b/glue/viewers/table/qt/data_viewer.py
@@ -270,7 +270,10 @@ class TableViewer(DataViewer):
     _state_cls = TableViewerState
 
     inherit_tools = False
-    tools = ['table:rowselect']
+    tools = ['table:rowselect', 'window']
+    subtools = {
+        'window': ['window:movetab', 'window:title']
+    }
 
     def __init__(self, session, state=None, parent=None, widget=None):
 
@@ -377,7 +380,9 @@ def add_subset(self, subset):
 
     @property
     def window_title(self):
-        if len(self.state.layers) > 0:
+        if self.state.title:
+            return self.state.title
+        elif len(self.state.layers) > 0:
             return 'Table: ' + self.state.layers[0].layer.label
         else:
             return 'Table'