diff --git a/js/oekaki.js b/js/oekaki.js
index 6197386d..e08f2d3f 100644
--- a/js/oekaki.js
+++ b/js/oekaki.js
@@ -16,7 +16,7 @@ var oekaki_form = '\
 
 function init_oekaki() {
 	// Add oekaki after the file input
-	$('input[type="file"]').parent().parent().after(oekaki_form);
+	$('form[name="post"]:not(#quick-reply) input[type="file"]').parent().parent().after(oekaki_form);
 	// Add "edit in oekaki" links
 	$(".fileinfo .unimportant").append(' <a href="javascript:void(0)" class="edit_in_oekaki">['+_('Edit in oekaki')+']</a>');
 	// Init oekaki vars
diff --git a/js/quick-reply.js b/js/quick-reply.js
index 267b6915..ea56b984 100644
--- a/js/quick-reply.js
+++ b/js/quick-reply.js
@@ -232,6 +232,11 @@ var show_quick_reply = function(){
 					$td.removeAttr('colspan');
 				}
 			}
+
+			// Remove oekaki if existent
+			if ($(this).is('#oekaki')) {
+				$(this).remove();
+			}
 			
 			// Remove mod controls, because it looks shit.
 			if ($td.find('input[type="checkbox"]').length) {