diff --git a/app/assets/javascripts/discourse/routes/discovery_route_builders.js b/app/assets/javascripts/discourse/routes/discovery_route_builders.js
index 6e1194d22af..5bc00c8be65 100644
--- a/app/assets/javascripts/discourse/routes/discovery_route_builders.js
+++ b/app/assets/javascripts/discourse/routes/discovery_route_builders.js
@@ -38,17 +38,20 @@ function buildTopicRoute(filter) {
         model: model,
         category: null,
         period: period,
-        selected: [],
+        selected: []
       });
 
       // If there's a draft, open the create topic composer
       if (model.draft) {
-        this.controllerFor('composer').open({
-          action: Discourse.Composer.CREATE_TOPIC,
-          draft: model.draft,
-          draftKey: model.draft_key,
-          draftSequence: model.draft_sequence
-        });
+        var composer = this.controllerFor('composer');
+        if (!composer.get('model.viewOpen')) {
+          composer.open({
+            action: Discourse.Composer.CREATE_TOPIC,
+            draft: model.draft,
+            draftKey: model.draft_key,
+            draftSequence: model.draft_sequence
+          });
+        }
       }
 
       this.controllerFor('navigationDefault').set('canCreateTopic', model.get('can_create_topic'));