diff --git a/app/views/play/level/LevelLoadingView.coffee b/app/views/play/level/LevelLoadingView.coffee
index 68a6ca701..fde29cd63 100644
--- a/app/views/play/level/LevelLoadingView.coffee
+++ b/app/views/play/level/LevelLoadingView.coffee
@@ -75,9 +75,7 @@ module.exports = class LevelLoadingView extends CocoView
   prepareIntro: ->
     @docs = @level.get('documentation') ? {}
     specific = @docs.specificArticles or []
-    return unless @intro = _.find specific, name: 'Intro'
-    @intro.html = marked utils.filterMarkdownCodeLanguages(utils.i18n(@intro, 'body'))
-    @intro.name = utils.i18n @intro, 'name'
+    @intro = _.find specific, name: 'Intro'
 
   showReady: ->
     return if @shownReady
@@ -86,7 +84,9 @@ module.exports = class LevelLoadingView extends CocoView
 
   finishShowingReady: =>
     return if @destroyed
-    if @options.autoUnveil or (@session?.get('state').complete and not @getQueryVariable('intro'))
+    showIntro = @getQueryVariable('intro')
+    autoUnveil = not showIntro and (@options.autoUnveil or @session?.get('state').complete)
+    if autoUnveil
       @startUnveiling()
       @unveil true
     else
@@ -166,7 +166,8 @@ module.exports = class LevelLoadingView extends CocoView
 
   unveilIntro: =>
     return if @destroyed or not @intro or @unveiled
-    @$el.find('.intro-doc').html @intro.html
+    html = marked utils.filterMarkdownCodeLanguages(utils.i18n(@intro, 'body'))
+    @$el.find('.intro-doc').html html
     @resize()
 
   onUnveilEnded: =>
diff --git a/app/views/play/level/PlayLevelView.coffee b/app/views/play/level/PlayLevelView.coffee
index f4f43f450..78828d08d 100644
--- a/app/views/play/level/PlayLevelView.coffee
+++ b/app/views/play/level/PlayLevelView.coffee
@@ -341,7 +341,7 @@ module.exports = class PlayLevelView extends RootView
       return Backbone.Mediator.subscribeOnce 'modal:closed', @onLevelStarted, @
     @surface.showLevel()
     Backbone.Mediator.publish 'level:set-time', time: 0
-    if @isEditorPreview or @observing
+    if (@isEditorPreview or @observing) and not @getQueryVariable('intro')
       @loadingView.startUnveiling()
       @loadingView.unveil true