diff --git a/app/styles/play/level.sass b/app/styles/play/level.sass
index 3abc58d24..90e40715f 100644
--- a/app/styles/play/level.sass
+++ b/app/styles/play/level.sass
@@ -42,7 +42,6 @@ body.is-playing
       position: fixed
       width: 100%
       height: 100%
-      z-index: 20
     
   #pointer
     position: absolute
diff --git a/app/views/play/level/tome/spell_list_tab_entry_view.coffee b/app/views/play/level/tome/spell_list_tab_entry_view.coffee
index 8a2500667..84816d112 100644
--- a/app/views/play/level/tome/spell_list_tab_entry_view.coffee
+++ b/app/views/play/level/tome/spell_list_tab_entry_view.coffee
@@ -34,6 +34,7 @@ module.exports = class SpellListTabEntryView extends SpellListEntryView
   afterRender: ->
     super()
     @$el.addClass 'spell-tab'
+    @attachTransitionEventListener()
 
   onNewWorld: (e) ->
     @thang = e.world.thangMap[@thang.id] if @thang
@@ -94,6 +95,8 @@ module.exports = class SpellListTabEntryView extends SpellListEntryView
     Backbone.Mediator.publish 'spell-beautify', spell: @spell
 
   onFullscreenClick: ->
+    $codearea = $('#code-area')
+    $codearea.css 'z-index', 20 unless $codearea.hasClass 'fullscreen-editor'
     $('#code-area').toggleClass 'fullscreen-editor'
     $('.fullscreen-code').toggleClass 'maximized'
 
@@ -134,6 +137,23 @@ module.exports = class SpellListTabEntryView extends SpellListEntryView
     filters.revertImage background, '.spell-list-entry-view.spell-tab' if @controlsEnabled
     filters.darkenImage background, '.spell-list-entry-view.spell-tab', 0.8 unless @controlsEnabled
 
+  attachTransitionEventListener: =>
+    transitionListener = ''
+    testEl = document.createElement 'fakeelement'
+    transitions = 
+      'transition':'transitionend'
+      'OTransition':'oTransitionEnd'
+      'MozTransition':'transitionend'
+      'WebkitTransition':'webkitTransitionEnd'
+    for transition, transitionEvent of transitions
+      unless testEl.style[transition] is undefined
+        transitionListener = transitionEvent
+        break
+    $codearea = $('#code-area')
+    $codearea.on transitionListener, =>
+      $codearea.css 'z-index', 1 unless $codearea.hasClass 'fullscreen-editor'
+
+
   destroy: ->
     @avatar?.destroy()
     @$el.find('code').popover 'destroy'