diff --git a/src/coffee/controllers/markdown_image_list_controller.coffee b/src/coffee/controllers/markdown_image_list_controller.coffee
index 0cc71f18e..a802ed78b 100644
--- a/src/coffee/controllers/markdown_image_list_controller.coffee
+++ b/src/coffee/controllers/markdown_image_list_controller.coffee
@@ -24,6 +24,9 @@ module.exports = class MarkdownImageListController extends BaseController
 
     # Public Methods ###############################################################################
 
+    fetchImages: ->
+        @model.fetchImages()
+
     getImageUrlForFile: (fileName)->
         @model.getFile(fileName).imageUrl
 
@@ -68,8 +71,6 @@ module.exports = class MarkdownImageListController extends BaseController
         super
 
     refresh: ->
-        @model.fetchImages()
-
         @_controllers ?= []
         index = 0
 
diff --git a/src/coffee/controllers/markdown_section_controller.coffee b/src/coffee/controllers/markdown_section_controller.coffee
index ec121d29a..a12b74fe2 100644
--- a/src/coffee/controllers/markdown_section_controller.coffee
+++ b/src/coffee/controllers/markdown_section_controller.coffee
@@ -144,7 +144,7 @@ module.exports = class MarkdownSectionController extends BaseController
 
         logger.verbose => "MarkdownSectionController.#{@cid} changed state from #{oldState} to #{newState}"
         @trigger Event.change + ':state', this, oldState, newState
-        @_updateStateVisibility()
+        @tryRefresh()
 
     Object.defineProperties @prototype,
         editable:   { get:@prototype.isEditable }
@@ -176,10 +176,13 @@ module.exports = class MarkdownSectionController extends BaseController
     refresh: ->
         @$title.html @title
         @_imageListController.markdownText = @model
+        @_imageListController.fetchImages() if @state is State.editing
 
         @_updateButtonStates()
         @_updateSizer()
         @_updatePreview()
+        @_updateStateVisibility()
+
         super
 
     onWillChangeModel: (oldModel, newModel)->