diff --git a/app/assets/javascripts/discourse/components/composer-editor.js.es6 b/app/assets/javascripts/discourse/components/composer-editor.js.es6
index 89a45660d58..2639b741f91 100644
--- a/app/assets/javascripts/discourse/components/composer-editor.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-editor.js.es6
@@ -341,6 +341,7 @@ export default Ember.Component.extend({
 
   @on('willDestroyElement')
   _composerClosed() {
+    this.appEvents.trigger('composer:will-close');
     Ember.run.next(() => {
       $('#main-outlet').css('padding-bottom', 0);
       // need to wait a bit for the "slide down" transition of the composer
diff --git a/app/assets/javascripts/discourse/components/topic-progress.js.es6 b/app/assets/javascripts/discourse/components/topic-progress.js.es6
index 6f9c5533011..90a75ef1a6d 100644
--- a/app/assets/javascripts/discourse/components/topic-progress.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-progress.js.es6
@@ -9,15 +9,16 @@ export default Ember.Component.extend({
   progressPosition: null,
   postStream: Ember.computed.alias('topic.postStream'),
   userWantsToJump: null,
+  composerVisible: null,
 
   init() {
     this._super();
     (this.get('delegated') || []).forEach(m => this.set(m, m));
   },
 
-  @computed('userWantsToJump', 'showTimeline')
-  hidden(userWantsToJump, showTimeline) {
-    return !userWantsToJump && showTimeline;
+  @computed('userWantsToJump', 'showTimeline', 'composerVisible')
+  hidden(userWantsToJump, showTimeline, composerVisible) {
+    return !userWantsToJump && !composerVisible && showTimeline;
   },
 
   @observes('hidden')
@@ -77,11 +78,23 @@ export default Ember.Component.extend({
     Ember.run.scheduleOnce('afterRender', this, this._updateProgressBar);
   },
 
+  _composerOpened() {
+    this.set('composerVisible', true);
+    this._dock();
+  },
+
+  _composerWillClose() {
+    this.set('composerVisible', false);
+  },
+
   didInsertElement() {
     this._super();
-    this.appEvents.on("composer:opened", this, this._dock)
-                  .on("composer:resized", this, this._dock)
-                  .on("composer:closed", this, this._dock)
+
+    this.appEvents.on('composer:opened', this, this._composerOpened);
+    this.appEvents.on('composer:will-close', this, this._composerWillClose);
+
+    this.appEvents.on("composer:resized", this, this._dock)
+                  .on('composer:closed', this, this._dock)
                   .on("topic:scrolled", this, this._dock)
                   .on('topic:current-post-changed', postNumber => this.set('progressPosition', postNumber))
                   .on('topic-progress:keyboard-trigger', this, this.keyboardTrigger);
@@ -91,9 +104,10 @@ export default Ember.Component.extend({
 
   willDestroyElement() {
     this._super();
-    this.appEvents.off("composer:opened", this, this._dock)
-                  .off("composer:resized", this, this._dock)
-                  .off("composer:closed", this, this._dock)
+    this.appEvents.off('composer:opened', this, this._composerOpened);
+    this.appEvents.off('composer:will-close', this, this._composerWillClose);
+    this.appEvents.off("composer:resized", this, this._dock)
+                  .off('composer:closed', this, this._dock)
                   .off('topic:scrolled', this, this._dock)
                   .off('topic:current-post-changed')
                   .off('topic-progress:keyboard-trigger');
@@ -111,9 +125,14 @@ export default Ember.Component.extend({
     const totalWidth = this._totalWidth;
     const progressWidth = this.get('streamPercentage') * totalWidth;
 
-    $topicProgress.find('.bg')
-      .css("border-right-width", (progressWidth === totalWidth) ? "0px" : "1px")
-      .width(progressWidth);
+    const borderSize = (progressWidth === totalWidth) ? "0px" : "1px";
+    const $bg = $topicProgress.find('.bg');
+    if ($bg.length === 0) {
+      const style = `border-right-width: ${borderSize}; width: ${progressWidth}px`;
+      $topicProgress.append(`<div class='bg' style="${style}">&nbsp;</div>`);
+    } else {
+      $bg.css("border-right-width", borderSize).width(progressWidth);
+    }
   },
 
   _dock() {
diff --git a/app/assets/javascripts/discourse/templates/components/topic-progress.hbs b/app/assets/javascripts/discourse/templates/components/topic-progress.hbs
index 738778aa3af..55658fc3a40 100644
--- a/app/assets/javascripts/discourse/templates/components/topic-progress.hbs
+++ b/app/assets/javascripts/discourse/templates/components/topic-progress.hbs
@@ -24,6 +24,5 @@
       <h4>{{postStream.filteredPostsCount}}</h4></span>
     </div>
     <i class="fa {{unless expanded 'fa-sort'}}"></i>
-    <div class='bg'>&nbsp;</div>
   </nav>
 {{/unless}}
diff --git a/app/assets/stylesheets/desktop/topic.scss b/app/assets/stylesheets/desktop/topic.scss
index f51abd1c36c..d14ca18d0ab 100644
--- a/app/assets/stylesheets/desktop/topic.scss
+++ b/app/assets/stylesheets/desktop/topic.scss
@@ -183,7 +183,6 @@
     border-right: 1px solid  dark-light-diff($tertiary, $secondary, 85%, -65%);
     background-color:  dark-light-diff($tertiary, $secondary, 85%, -65%);
     transition: width .75s;
-
   }
 }