diff --git a/journals/forms.py b/journals/forms.py
index a88d073c85828b2dbfbfdb98be0e8160347e4ea9..fb9dc1a61683b76c54318215cccb75482d59c2ed 100644
--- a/journals/forms.py
+++ b/journals/forms.py
@@ -418,7 +418,10 @@ class DraftPublicationForm(forms.ModelForm):
     def get_possible_issues(self):
         issues = Issue.objects.filter(until_date__gte=timezone.now())
         if self.submission:
-            issues = issues.for_journal(self.submission.editorial_decision.for_journal.name)
+            issues = (
+                issues.for_journal(self.submission.submitted_to.name) |
+                issues.for_journal(self.submission.editorial_decision.for_journal.name)
+            ).distinct()
         return issues
 
     def delete_secondary_fields(self):