diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 6cbfdf630e6..2892eb4d93a 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -138,6 +138,9 @@ Bug Fixes
 * SOLR-5171: SOLR Admin gui works in IE9, breaks in IE10. (Joseph L Howard via
   steffkes)
 
+* SOLR-5174: Admin UI - Query View doesn't highlight (json) Result if it 
+  contains HTML Tags (steffkes)
+
 Optimizations
 ----------------------
 
diff --git a/solr/webapp/web/js/scripts/app.js b/solr/webapp/web/js/scripts/app.js
index c7d78281cbf..1d797aa2759 100644
--- a/solr/webapp/web/js/scripts/app.js
+++ b/solr/webapp/web/js/scripts/app.js
@@ -552,7 +552,7 @@ var solr_admin = function( app_config )
       json_str = JSON.stringify( JSON.parse( json_str ), undefined, 2 );
     }
 
-    return json_str;
+    return json_str.esc();
   };
 
   this.format_number = function format_number( number )