diff --git a/common/lib/xmodule/xmodule/js/src/problem/edit.coffee b/common/lib/xmodule/xmodule/js/src/problem/edit.coffee
index f01927e0d7..b869bde966 100644
--- a/common/lib/xmodule/xmodule/js/src/problem/edit.coffee
+++ b/common/lib/xmodule/xmodule/js/src/problem/edit.coffee
@@ -147,6 +147,9 @@ class @MarkdownEditingDescriptor extends XModule.Descriptor
 
       // rid white space
       xml = xml.replace(/\n\n\n/g, '\n');
+      
+      // surround w/ problem tag
+      xml = '<problem>\n' + xml + '\n</problem>';
 
       return xml;
     }
diff --git a/common/lib/xmodule/xmodule/templates/problem/numericalresponse.yaml b/common/lib/xmodule/xmodule/templates/problem/numericalresponse.yaml
index 8413105cba..7ac4daa88a 100644
--- a/common/lib/xmodule/xmodule/templates/problem/numericalresponse.yaml
+++ b/common/lib/xmodule/xmodule/templates/problem/numericalresponse.yaml
@@ -3,7 +3,8 @@ metadata:
     display_name: Numerical Response
     rerandomize: never
     showanswer: always
-    markdown: "A numerical response problem accepts a line of text input from the
+    markdown: |
+       A numerical response problem accepts a line of text input from the
        student, and evaluates the input for correctness based on its
        numerical value.  
 
@@ -18,7 +19,6 @@ metadata:
     
        Enter the number of fingers on a human hand: 
        = 5
-        "
 data: |
    <problem>
    <p>