diff --git a/features/front-matter.feature b/features/front-matter.feature
index 37d8d3ba..78713755 100644
--- a/features/front-matter.feature
+++ b/features/front-matter.feature
@@ -5,4 +5,27 @@ Feature: YAML Front Matter
     Given the Server is running at "test-app"
     When I go to "/front-matter.html"
     Then I should see "<h1>This is the title</h1>"
-    Then I should not see "---"
\ No newline at end of file
+    Then I should not see "---"
+
+  Scenario: A template changes frontmatter during preview
+    Given the Server is running at "test-app"
+    And the file "source/front-matter-change.html.erb" has the contents
+      """
+      ---
+      title: Hello World
+      layout: false
+      ---
+      <%= data.page.title %>
+      """
+    When I go to "/front-matter-change.html"
+    Then I should see "Hello World"
+    And the file "source/front-matter-change.html.erb" has the contents
+      """
+      ---
+      title: Hola Mundo
+      layout: false
+      ---
+      <%= data.page.title %>
+      """
+    When I go to "/front-matter-change.html"
+    Then I should see "Hola Mundo"
\ No newline at end of file
diff --git a/fixtures/test-app/source/front-matter-change.html.erb b/fixtures/test-app/source/front-matter-change.html.erb
new file mode 100644
index 00000000..044e469d
--- /dev/null
+++ b/fixtures/test-app/source/front-matter-change.html.erb
@@ -0,0 +1,5 @@
+---
+title: Hola Mundo
+layout: false
+---
+<%= data.page.title %>
\ No newline at end of file