diff --git a/assets/javascripts/discourse/controllers/admin-wizards-submissions.js.es6 b/assets/javascripts/discourse/controllers/admin-wizards-submissions.js.es6
index b5b9365a..7388a8d6 100644
--- a/assets/javascripts/discourse/controllers/admin-wizards-submissions.js.es6
+++ b/assets/javascripts/discourse/controllers/admin-wizards-submissions.js.es6
@@ -1,6 +1,34 @@
 import Controller from "@ember/controller";
+import { default as discourseComputed } from "discourse-common/utils/decorators";
 
 export default Controller.extend({
-  messageKey: "select",
   documentationUrl: "https://thepavilion.io/t/2818",
+
+  @discourseComputed("wizardId")
+  wizardName(wizardId) {
+    let currentWizard = this.wizardList.find(
+      (wizard) => wizard.id === wizardId
+    );
+    if (currentWizard) {
+      return currentWizard.name;
+    }
+  },
+
+  @discourseComputed("wizardName")
+  messageOpts(wizardName) {
+    return {
+      wizardName,
+    };
+  },
+
+  @discourseComputed("wizardId")
+  messageKey(wizardId) {
+    let key = "select";
+
+    if (wizardId) {
+      key = "viewing";
+    }
+
+    return key;
+  },
 });
diff --git a/assets/javascripts/discourse/templates/admin-wizards-submissions.hbs b/assets/javascripts/discourse/templates/admin-wizards-submissions.hbs
index 5a660790..07dd1682 100644
--- a/assets/javascripts/discourse/templates/admin-wizards-submissions.hbs
+++ b/assets/javascripts/discourse/templates/admin-wizards-submissions.hbs
@@ -1,4 +1,4 @@
-<div class="admin-wizard-select">
+<div class="admin-wizard-select admin-wizard-controls">
   {{combo-box
     value=wizardId
     content=wizardList
@@ -10,6 +10,7 @@
 
 {{wizard-message
   key=messageKey
+  opts=messageOpts
   url=documentationUrl
   component="submissions"}}
 
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index fa3a6c5d..31f10924 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -93,6 +93,7 @@ en:
             destroy_complete: Destruction complete
           submissions:
             select: "Select a wizard to see its submissions"
+            viewing: "You're viewing the logs of the %{wizardName}. Click 'Download' on the right to download them."
             documentation: "Check out the submissions documentation"
         
         editor: