diff --git a/ext/redcloth_scan/redcloth_scan.rl b/ext/redcloth_scan/redcloth_scan.rl
index f3a96341..2b53d905 100644
--- a/ext/redcloth_scan/redcloth_scan.rl
+++ b/ext/redcloth_scan/redcloth_scan.rl
@@ -121,27 +121,30 @@ int SYM_escape_preformatted;
   *|;
   
   notextile_block := |*
-    EOF { 
-      DONE(block); 
-      fgoto main; 
+    EOF {
+      ADD_BLOCK();
+      fgoto main;
     };
-    double_return { 
-      if (NIL_P(extend)) { 
-        DONE(block); 
-        fgoto main; 
-      } else { 
-        CAT(block); 
-        DONE(block); 
-      } 
+    double_return {
+      if (NIL_P(extend)) {
+        ADD_BLOCK();
+        CAT(html);
+        fgoto main;
+      } else {
+        CAT(block);
+        ADD_EXTENDED_BLOCK();
+        CAT(html);
+      }
     };
-    double_return next_block_start { 
-      if (NIL_P(extend)) { 
-        DONE(block); 
-        fgoto main; 
-      } else { 
-        CAT(block); 
-        DONE(block); 
-        END_EXTENDED(); 
+    double_return next_block_start {
+      if (NIL_P(extend)) {
+        ADD_BLOCK();
+        CAT(html);
+        fgoto main;
+      } else {
+        CAT(block);
+        ADD_EXTENDED_BLOCK();
+        END_EXTENDED();
         fgoto main; 
       } 
     };
@@ -274,7 +277,7 @@ int SYM_escape_preformatted;
   main := |*
     noparagraph_line_start  { ASET(type, ignored_line); fgoto noparagraph_line; };
     notextile_tag_start { ASET(type, notextile); fgoto notextile_tag; };
-    notextile_block_start { fgoto notextile_block; };
+    notextile_block_start { ASET(type, notextile); fgoto notextile_block; };
     script_tag_start { CAT(block); fgoto script_tag; };
     pre_tag_start       { ASET(type, notextile); CAT(block); fgoto pre_tag; };
     pre_block_start { fgoto pre_block; };
diff --git a/test/filter_html.yml b/test/filter_html.yml
index 0c230690..f0ce1113 100644
--- a/test/filter_html.yml
+++ b/test/filter_html.yml
@@ -82,6 +82,22 @@ in: |-
 filtered_html: |-
   <p>I have some <code>&lt;em&gt;awesome&lt;/em&gt; code</code> here.</p>
 ---
+name: escapes html notextile block
+in: |-
+  notextile. This is a <em>notextile</em> block.
+filtered_html: |-
+  This is a &lt;em&gt;notextile&lt;/em&gt; block.
+---
+name: escapes html in pre tags
+in: |-
+  <pre>
+  This should be <em>escaped</em>.
+  </pre>
+filtered_html: |-
+  <pre>
+  This should be &lt;em&gt;escaped&lt;/em&gt;.
+  </pre>
+---
 in: Here's a bad image <img src="JaVaScRiPt:alert('XSS');">
 filtered_html: <p>Here&#8217;s a bad image &lt;img src="JaVaScRiPt:alert('XSS');"&gt;</p>
 ---