diff --git a/flat_json_widget/static/flat-json-widget/js/flat-json-widget.js b/flat_json_widget/static/flat-json-widget/js/flat-json-widget.js
index 724f204..8583f66 100644
--- a/flat_json_widget/static/flat-json-widget/js/flat-json-widget.js
+++ b/flat_json_widget/static/flat-json-widget/js/flat-json-widget.js
@@ -100,9 +100,14 @@ var initJsonKeyValueWidget = function(fieldName, inlinePrefix) {
             var inputs = $(this).find('input'),
                 key = inputs.eq(0).val(),
                 value = inputs.eq(1).val();
+
+            if (typeof value != 'undefined') {
+                try { value = JSON.parse(value); } catch (e) {}
+            }
             newValue[key] = value;
         });
 
+
         // update textarea value
         $(rawTextarea).val(JSON.stringify(newValue, null, 4));
     };