diff --git a/libraries/classes/Display/Results.php b/libraries/classes/Display/Results.php
index 854505ea06..88be9626b9 100644
--- a/libraries/classes/Display/Results.php
+++ b/libraries/classes/Display/Results.php
@@ -2339,9 +2339,9 @@ class Results
     /**
      * Prepares the display for a value
      *
-     * @param string $class           class of table cell
-     * @param bool   $condition_field whether to add CSS class condition
-     * @param string $value           value to display
+     * @param string $class          class of table cell
+     * @param bool   $conditionField whether to add CSS class condition
+     * @param string $value          value to display
      *
      * @return string  the td
      *
@@ -2350,12 +2350,14 @@ class Results
      * @see     _getDataCellForGeometryColumns(),
      *          _getDataCellForNonNumericColumns()
      */
-    private function _buildValueDisplay($class, $condition_field, $value)
+    private function _buildValueDisplay($class, $conditionField, $value)
     {
-        return '<td class="left ' . $class . ($condition_field ? ' condition' : '')
-            . '">' . $value . '</td>';
-    } // end of the '_buildValueDisplay()' function
-
+        return Template::get('display/results/value_display')->render([
+            'class' => $class,
+            'condition_field' => $conditionField,
+            'value' => $value,
+        ]);
+    }
 
     /**
      * Prepares the display for a null value
diff --git a/templates/display/results/value_display.twig b/templates/display/results/value_display.twig
new file mode 100644
index 0000000000..35640b91ca
--- /dev/null
+++ b/templates/display/results/value_display.twig
@@ -0,0 +1,3 @@
+<td class="left {{ class }}{{ condition_field ? ' condition' }}">
+    {{ value|raw }}
+</td>
diff --git a/test/classes/Display/ResultsTest.php b/test/classes/Display/ResultsTest.php
index 28b98abe03..87cde0cf56 100644
--- a/test/classes/Display/ResultsTest.php
+++ b/test/classes/Display/ResultsTest.php
@@ -1491,11 +1491,13 @@ class ResultsTest extends PmaTestCase
                 array(),
                 0,
                 'binary',
-                '<td class="left   hex"><a href="tbl_get_field.php?'
+                '<td class="left   hex">' . PHP_EOL
+                . '    <a href="tbl_get_field.php?'
                 . 'db=foo&amp;table=tbl&amp;server=0&amp;lang=en'
                 . '&amp;collation_connection=utf-8'
                 . '" '
-                . 'class="disableAjax">[BLOB - 4 B]</a></td>'
+                . 'class="disableAjax">[BLOB - 4 B]</a>' . PHP_EOL
+                . '</td>' . PHP_EOL
             ),
             array(
                 'noblob',
@@ -1512,8 +1514,9 @@ class ResultsTest extends PmaTestCase
                 array(),
                 0,
                 'binary',
-                '<td class="left grid_edit  transformed hex">'
-                . '1001</td>'
+                '<td class="left grid_edit  transformed hex">' . PHP_EOL
+                . '    1001' . PHP_EOL
+                . '</td>' . PHP_EOL
             ),
             array(
                 'noblob',