diff --git a/app/assets/javascripts/experiments/table.js b/app/assets/javascripts/experiments/table.js
index 50359fb07..10412088b 100644
--- a/app/assets/javascripts/experiments/table.js
+++ b/app/assets/javascripts/experiments/table.js
@@ -665,12 +665,12 @@ ExperimnetTable.render.assigned = function(data) {
 };
 
 ExperimnetTable.render.tags = function(data) {
-  let value;
-  if (!data.can_create) {
-    value = parseInt(data.tags, 10) === 0 ? I18n.t('experiments.table.not_set') : data.tags;
-    return `<span class="disabled">${value}</span>`;
+  const value = parseInt(data.tags, 10) === 0 ? I18n.t('experiments.table.add_tag') : data.tags;
+
+  if (data.tags === 0 && !data.can_create) {
+    return `<span class="disabled">${I18n.t('experiments.table.not_set')}</span>`;
   }
-  value = parseInt(data.tags, 10) === 0 ? I18n.t('experiments.table.add_tag') : data.tags;
+
   return `<a href="${data.edit_url}"
              id="myModuleTags${data.my_module_id}"
              data-remote="true"
diff --git a/app/assets/stylesheets/experiment/show.scss b/app/assets/stylesheets/experiment/show.scss
index e7388a899..19fc0840c 100644
--- a/app/assets/stylesheets/experiment/show.scss
+++ b/app/assets/stylesheets/experiment/show.scss
@@ -8,6 +8,14 @@
   }
 }
 
+#experimentTable {
+  &.archived {
+    [data-view-mode="active"] {
+      display: none !important;
+    }
+  }
+}
+
 #experiment-canvas {
   [data-view-mode="archived"] {
     display: none;
diff --git a/app/views/experiments/table.html.erb b/app/views/experiments/table.html.erb
index 816f11d2b..ce59a8db0 100644
--- a/app/views/experiments/table.html.erb
+++ b/app/views/experiments/table.html.erb
@@ -31,6 +31,7 @@
     </div>
     <%= render partial: 'experiments/no_task_results.html.erb' %>
   </div>
+  <%= render partial: "my_modules/modals/manage_module_tags_modal", locals: { my_module: nil } %>
 </div>
 
 <template id="experimentTablePlaceholder">
@@ -55,7 +56,6 @@
   </div>
 </template>
 
-<%= render partial: "my_modules/modals/manage_module_tags_modal", locals: { my_module: nil } %>
 <%= render partial: "canvas/edit/modal/edit_module" %>
 <%= render partial: "experiments/table_display_modal"%>