diff --git a/src/submission/tests/test_workflow.py b/src/submission/tests/test_workflow.py
index a69630f01a..0c1d09440a 100644
--- a/src/submission/tests/test_workflow.py
+++ b/src/submission/tests/test_workflow.py
@@ -447,6 +447,48 @@ def test_submit_info_view_form_selection_author(self):
         self.assertEqual(response.status_code, 200)
         self.assertNotContains(response, section.__str__())
 
+    @override_settings(URL_CONFIG="domain")
+    def test_submit_info_view_shows_journal_disciplines_as_keyword_suggestions(self):
+        author_1, _ = self.create_authors()
+        clear_cache()
+        article = models.Article.objects.create(
+            journal=self.journal_one,
+            title="Test article: keyword suggestions",
+            owner=author_1,
+        )
+        medicine = models.Keyword.objects.create(word="Medicine")
+        arts = models.Keyword.objects.create(word="Arts")
+        self.journal_one.keywords.add(medicine, arts)
+
+        self.client.force_login(author_1)
+        clear_script_prefix()
+        response = self.client.get(
+            reverse("submit_info", kwargs={"article_id": article.pk}),
+            SERVER_NAME="testserver",
+        )
+
+        self.assertEqual(response.status_code, 200)
+        self.assertContains(response, '"Medicine"')
+        self.assertContains(response, '"Arts"')
+
+    @override_settings(URL_CONFIG="domain")
+    def test_edit_metadata_view_shows_journal_disciplines_as_keyword_suggestions(self):
+        article = helpers.create_article(self.journal_one)
+        medicine = models.Keyword.objects.create(word="Medicine")
+        arts = models.Keyword.objects.create(word="Arts")
+        self.journal_one.keywords.add(medicine, arts)
+
+        self.client.force_login(self.editor)
+        clear_script_prefix()
+        response = self.client.get(
+            reverse("edit_metadata", kwargs={"article_id": article.pk}),
+            SERVER_NAME="testserver",
+        )
+
+        self.assertEqual(response.status_code, 200)
+        self.assertContains(response, '"Medicine"')
+        self.assertContains(response, '"Arts"')
+
     def test_article_issue_title(self):
         from utils.testing import helpers
 
diff --git a/src/templates/admin/submission/edit/metadata.html b/src/templates/admin/submission/edit/metadata.html
index 9c8e1e2105..356737fbd7 100644
--- a/src/templates/admin/submission/edit/metadata.html
+++ b/src/templates/admin/submission/edit/metadata.html
@@ -241,7 +241,14 @@ <h5>Add funder</h5>
     <script type="text/javascript">
         $(document).ready(function () {
             $("#id_keywords").tagit(
-                {allowSpaces: true});
+                {
+                    allowSpaces: true,
+                    availableTags: [
+                        {% for keyword in request.journal.keywords.all %}
+                            "{{ keyword.word|escapejs }}"{% if not forloop.last %},{% endif %}
+                        {% endfor %}
+                    ]
+                });
         });
     </script>
     <script src="{% static "admin/js/csrf.js" %}"></script>
diff --git a/src/templates/admin/submission/submit_info.html b/src/templates/admin/submission/submit_info.html
index 9e2f2a057d..86f07ae43c 100644
--- a/src/templates/admin/submission/submit_info.html
+++ b/src/templates/admin/submission/submit_info.html
@@ -125,7 +125,14 @@ <h2 id="licensetitle">{% trans 'License Information' %}</h2>
     <script type="text/javascript">
         $(document).ready(function () {
             $("#id_keywords").tagit(
-                {allowSpaces: true});
+                {
+                    allowSpaces: true,
+                    availableTags: [
+                        {% for keyword in request.journal.keywords.all %}
+                            "{{ keyword.word|escapejs }}"{% if not forloop.last %},{% endif %}
+                        {% endfor %}
+                    ]
+                });
         });
     </script>
 {% endblock %}