diff --git a/src/Posting/QR.coffee b/src/Posting/QR.coffee
index af84016e7..1a1562857 100644
--- a/src/Posting/QR.coffee
+++ b/src/Posting/QR.coffee
@@ -364,6 +364,7 @@ QR =
     $.on el, (if isVideo then 'loadeddata' else 'load'), ->
       e.target.getContext('2d').drawImage el, 0, 0
       URL.revokeObjectURL el.src
+      $.event 'QRImageDrawn', null, e.target
     el.src = URL.createObjectURL file
 
   openError: ->
diff --git a/src/Posting/QR.oekaki.coffee b/src/Posting/QR.oekaki.coffee
index 5a6cb0146..6fecad203 100644
--- a/src/Posting/QR.oekaki.coffee
+++ b/src/Posting/QR.oekaki.coffee
@@ -60,14 +60,14 @@ QR.oekaki =
         document.querySelector('#qr .oekaki').hidden = false
 
   load: (cb) ->
-    if $ 'script[src^="//s.4cdn.org/js/painter"]', d.head
+    if $ 'script[src^="//s.4cdn.org/js/tegaki"]', d.head
       cb()
     else
       style = $.el 'link',
         rel: 'stylesheet'
-        href: "//s.4cdn.org/css/painter.#{Date.now()}.css"
+        href: "//s.4cdn.org/css/tegaki.#{Date.now()}.css"
       script = $.el 'script',
-        src: "//s.4cdn.org/js/painter.min.#{Date.now()}.js"
+        src: "//s.4cdn.org/js/tegaki.min.#{Date.now()}.js"
       n = 0
       onload = ->
         cb() if ++n is 2
@@ -124,7 +124,16 @@ QR.oekaki =
           width:  +selected.dataset.width
           height: +selected.dataset.height
           bgColor: 'transparent'
-        Tegaki.activeCtx.canvas.dispatchEvent new CustomEvent 'QRDrawFile', {bubbles: true}
+        canvas = document.createElement 'canvas'
+        canvas.width  = canvas.naturalWidth  = +selected.dataset.width
+        canvas.height = canvas.naturalHeight = +selected.dataset.height
+        canvas.hidden = true
+        document.body.appendChild canvas
+        canvas.addEventListener 'QRImageDrawn', ->
+          @remove()
+          Tegaki.onOpenImageLoaded.call @
+        , false
+        canvas.dispatchEvent new CustomEvent 'QRDrawFile', {bubbles: true}
       if Tegaki.bg and Tegaki.onDoneCb is FCX.oekakiCB and source is FCX.oekakiLatest
         FCX.oekakiName = name
         Tegaki.resume()