diff --git a/lnt/server/ui/util.py b/lnt/server/ui/util.py
--- a/lnt/server/ui/util.py
+++ b/lnt/server/ui/util.py
@@ -249,18 +249,9 @@
         return last_path_name
 
 
-def baseline_key(ts_name=None):
-    """A unique name for baseline session keys per DB and suite.
-
-    Optionally, get the test-suite name from a parameter, when this is called
-    during submission the global context does not know which test-suite we are
-    in until too late.
-    """
-    if ts_name:
-        name = ts_name
-    else:
-        name = g.db_name
-    return "baseline-{}-{}".format(name, g.db_name)
+def baseline_key(ts_name):
+    """A unique name for baseline session keys per DB and suite."""
+    return "baseline-{}-{}".format(ts_name, g.db_name)
 
 
 integral_rex = re.compile(r"[\d]+")
diff --git a/lnt/server/ui/views.py b/lnt/server/ui/views.py
--- a/lnt/server/ui/views.py
+++ b/lnt/server/ui/views.py
@@ -174,7 +174,7 @@
 def ts_data(ts):
     """Data about the current testsuite used by layout.html which should be
     present in most templates."""
-    baseline_id = flask.session.get(baseline_key())
+    baseline_id = flask.session.get(baseline_key(ts.name))
     baselines = request.session.query(ts.Baseline).all()
     return {
         'baseline_id': baseline_id,
@@ -648,7 +648,7 @@
     if not base:
         return abort(404)
     flash("Baseline set to " + base.name, FLASH_SUCCESS)
-    flask.session[baseline_key()] = id
+    flask.session[baseline_key(ts.name)] = id
 
     return redirect(get_redirect_target())
 
@@ -1666,7 +1666,7 @@
     """
     session = request.session
     ts = request.get_testsuite()
-    base_id = flask.session.get(baseline_key())
+    base_id = flask.session.get(baseline_key(ts.name))
     if not base_id:
         return None
     try: