diff --git a/frontend_tests/casper_tests/14-drafts.js b/frontend_tests/casper_tests/14-drafts.js
index c35b2534e8..a7a3825a8c 100644
--- a/frontend_tests/casper_tests/14-drafts.js
+++ b/frontend_tests/casper_tests/14-drafts.js
@@ -70,6 +70,16 @@ casper.then(function () {
     });
 });
 
+casper.then(function () {
+    casper.test.info('Opening Markdown Preview');
+    casper.waitUntilVisible('#left_bar_compose_stream_button_big', function () {
+        casper.click('#left_bar_compose_stream_button_big');
+    });
+    casper.waitUntilVisible('#markdown_preview', function () {
+        casper.click('#markdown_preview');
+    });
+});
+
 casper.then(function () {
     casper.waitUntilVisible('.drafts-link', function () {
         casper.click('.drafts-link');
@@ -95,6 +105,7 @@ casper.then(function () {
     casper.click("#drafts_table .message_row:not(.private-message) .restore-draft");
     waitWhileDraftsVisible(function () {
         casper.test.assertVisible('#stream-message', 'Stream Message Box Restored');
+        casper.test.assertNotVisible('#preview_message_area', 'Preview Was Hidden');
         common.check_form('form#send_message_form', {
             stream: 'all',
             subject: 'tests',
diff --git a/static/js/drafts.js b/static/js/drafts.js
index dc8fd72dd0..d0bce16acb 100644
--- a/static/js/drafts.js
+++ b/static/js/drafts.js
@@ -143,6 +143,8 @@ exports.restore_draft = function (draft_id) {
 
     overlays.close_overlay("drafts");
     compose_fade.clear_compose();
+    compose.clear_preview_area();
+
     if (draft.type === "stream" && draft.stream === "") {
         draft_copy.subject = "";
     }