diff --git a/lib/galaxy/datatypes/tabular.py b/lib/galaxy/datatypes/tabular.py
index 148cd22b0d7..8d0559a1526 100644
--- a/lib/galaxy/datatypes/tabular.py
+++ b/lib/galaxy/datatypes/tabular.py
@@ -265,7 +265,7 @@ class Tabular( data.Text ):
         while cursor and ck_data[-1] != '\n':
             ck_data += cursor
             cursor = f.read(1)
-        return to_json_string({'ck_data': ck_data, 'ck_index': ck_index+1})
+        return to_json_string( { 'ck_data': util.unicodify( ck_data ), 'ck_index': ck_index + 1 } )
 
     def display_data(self, trans, dataset, preview=False, filename=None, to_ext=None, chunk=None):
         preview = util.string_as_bool( preview )
diff --git a/templates/webapps/galaxy/dataset/large_file.mako b/templates/webapps/galaxy/dataset/large_file.mako
index 4777503d9ae..68148d3cb6f 100644
--- a/templates/webapps/galaxy/dataset/large_file.mako
+++ b/templates/webapps/galaxy/dataset/large_file.mako
@@ -10,5 +10,5 @@ ${ render_deleted_data_message( data ) }
 </div>
 
 <pre>
-${ unicode( truncated_data, 'utf-8' ) | h }
+${ util.unicodify( truncated_data ) | h }
 </pre>