diff --git a/lib/tool_shed/webapp/templates/webapps/tool_shed/user/login.mako b/lib/tool_shed/webapp/templates/webapps/tool_shed/user/login.mako
index e011b828b8c..919d0e4b5d3 100644
--- a/lib/tool_shed/webapp/templates/webapps/tool_shed/user/login.mako
+++ b/lib/tool_shed/webapp/templates/webapps/tool_shed/user/login.mako
@@ -1,9 +1,7 @@
 <%!
 #This is a hack, we should restructure templates to avoid this.
 def inherit(context):
-    if context.get('trans').webapp.name == 'galaxy' and context.get( 'use_panels', True ):
-        return '/webapps/galaxy/base_panels.mako'
-    elif context.get('trans').webapp.name == 'tool_shed' and context.get( 'use_panels', True ):
+    if context.get('trans').webapp.name == 'tool_shed' and context.get( 'use_panels', True ):
         return '/webapps/tool_shed/base_panels.mako'
     else:
         return '/base.mako'
diff --git a/lib/tool_shed/webapp/templates/webapps/tool_shed/user/logout.mako b/lib/tool_shed/webapp/templates/webapps/tool_shed/user/logout.mako
index 20a38c04f36..5d388a2c241 100644
--- a/lib/tool_shed/webapp/templates/webapps/tool_shed/user/logout.mako
+++ b/lib/tool_shed/webapp/templates/webapps/tool_shed/user/logout.mako
@@ -1,9 +1,7 @@
 <%!
 #This is a hack, we should restructure templates to avoid this.
 def inherit(context):
-    if context.get('trans').webapp.name == 'galaxy':
-        return '/webapps/galaxy/base_panels.mako'
-    elif context.get('trans').webapp.name == 'tool_shed':
+    if context.get('trans').webapp.name == 'tool_shed':
         return '/webapps/tool_shed/base_panels.mako'
     else:
         return '/base.mako'