diff --git a/pagure/templates/file.html b/pagure/templates/file.html
index f312966..788ac4e 100644
--- a/pagure/templates/file.html
+++ b/pagure/templates/file.html
@@ -32,14 +32,16 @@
           <div class="dropdown-menu dropdown-menu-right">
             {% for branch in branches %}
               {% if origin == 'view_tree' %}
-                <a class="dropdown-item" href="{{ url_for('view_tree',
-                            username=username, repo=repo.name, identifier=branch) }}">
+                <a class="dropdown-item" href="{{ url_for(
+                    'view_tree',
+                    username=username, repo=repo.name, identifier=branch) }}">
                   {{ branch }}
                 </a>
               {% elif origin == 'view_file' %}
-                <a class="dropdown-item" href="{{ url_for('view_file',
-                            username=username, repo=repo.name, identifier=branch,
-                            filename=filename) }}">
+                <a class="dropdown-item" href="{{ url_for(
+                    'view_file',
+                    username=username, repo=repo.name, identifier=branch,
+                    filename=filename | unicode ) }}">
                   {{ branch }}
                 </a>
               {% endif %}
@@ -52,11 +54,16 @@
   </div>
     <div class="card">
       <div class="card-header">
-          <ol class="breadcrumb">
-          <li><a href="{{ url_for('view_tree', username=username,
+        <ol class="breadcrumb">
+          <li>
+            <a href="{{ url_for('view_tree', username=username,
                       repo=repo.name, identifier=branchname)
-          }}"><span class="oi" data-glyph="random"></span>&nbsp; {{ branchname }}</a></li>{%
-        for file in filename.split('/') %}
+          }}">
+              <span class="oi" data-glyph="random">
+              </span>&nbsp; {{ branchname }}
+            </a>
+          </li>
+        {% for file in filename.split('/') %}
           {% if loop.first %}
           {% set path = file %}
           {% else %}
@@ -65,8 +72,15 @@
           {% if loop.index != loop.length %}<li><a
           href="{{ url_for('view_file', username=username,
                   repo=repo.name, identifier=branchname,
-                  filename=path)}}"
-            ><span class="oi" data-glyph="folder"></span>&nbsp; {{ file }}</a></li>{% elif file %}<li class="active"><span class="oi" data-glyph="{% if output_type == 'tree' %}folder{% else %}file{% endif %}"></span>&nbsp; {{ file }}</li>{% endif %}
+                  filename=path | unicode)}}">
+            <span class="oi" data-glyph="folder"></span>&nbsp; {{ file }}</a>
+          </li>
+          {% elif file %}
+          <li class="active">
+            <span class="oi" data-glyph="{% if output_type == 'tree' %}folder{% else %}file{% endif %}">
+            </span>&nbsp; {{ file }}
+          </li>
+          {% endif %}
         {% endfor %}
         </ol>
       </div>
@@ -78,22 +92,27 @@
           {% if output_type in ('file','binary','image','markup') %}
             <div class="file-button-bar">
                 {% if output_type in ('file','markup') and repo_admin %}
-                <a class="btn btn-sm btn-secondary" href="{{ url_for('edit_file', username=username,
-                            repo=repo.name, branchname=branchname,
-                            filename=filename) }}" title="Edit file">Edit</a>
+                <a class="btn btn-sm btn-secondary" href="{{ url_for(
+                    'edit_file', username=username,
+                    repo=repo.name, branchname=branchname,
+                    filename=filename | unicode) }}" title="Edit file">Edit</a>
                 {% endif %}
                 {% if output_type == 'markup'  %}
-                <a class="btn btn-sm btn-secondary" href="{{ url_for('view_file', username=username,
-                            repo=repo.name, identifier=branchname,
-                            filename=filename, text=True) }}" title="View as text">Text</a>
+                <a class="btn btn-sm btn-secondary" href="{{ url_for(
+                    'view_file', username=username,
+                    repo=repo.name, identifier=branchname,
+                    filename=filename | unicode, text=True) }}"
+                    title="View as text">Text</a>
                 {% else %}
-                <a class="btn btn-secondary btn-sm" href="{{ url_for('view_file', username=username,
-                            repo=repo.name, identifier=branchname,
-                            filename=filename) }}" title="View as blob">Blob</a>
+                <a class="btn btn-secondary btn-sm" href="{{ url_for(
+                    'view_file', username=username,
+                    repo=repo.name, identifier=branchname,
+                    filename=filename | unicode) }}" title="View as blob">Blob</a>
                 {% endif %}
-                <a class="btn btn-secondary btn-sm" href="{{ url_for('view_raw_file', username=username,
-                            repo=repo.name, identifier=branchname,
-                            filename=filename) }}" title="View as raw">Raw</a>
+                <a class="btn btn-secondary btn-sm" href="{{ url_for(
+                    'view_raw_file', username=username,
+                    repo=repo.name, identifier=branchname,
+                    filename=filename) | unicode }}" title="View as raw">Raw</a>
             </div>
           {% endif %}
         {% endif %}
@@ -109,14 +128,14 @@
     {% elif output_type == 'image' %}
         <img src="{{ url_for('view_raw_file', username=username,
                     repo=repo.name, identifier=branchname,
-                    filename=filename) }}"/>
+                    filename=filename | unicode) }}"/>
     {% elif output_type == 'binary' %}
         <p class="noresult">
           Binary files cannot be rendered.<br/>
           Please
           <a href="{{ url_for('view_raw_file', username=username,
                     repo=repo.name, identifier=branchname,
-                    filename=filename) }}">view the raw version
+                    filename=filename | unicode) }}">view the raw version
           </a>
         </p>
     {% endif %}
@@ -139,9 +158,9 @@
                 <a href="{{ url_for(
                     'view_file', username=username,repo=repo.name,
                     identifier=branchname,
-                    filename=filename + '/' +
-                    entry.name if filename else entry.name) }}">
-                   {{ entry.name }}
+                    filename=filename | unicode + '/' +
+                    entry.name | unicode if filename else entry.name) }}">
+                   {{ entry.name | unicode }}
                 </a>{% if entry.filemode == 16384 %}</strong>{% endif%}
             </td>
             <td class-"pagure-table-filehex">
diff --git a/tests/test_pagure_flask_ui_no_master_branch.py b/tests/test_pagure_flask_ui_no_master_branch.py
index d843d86..b34f7b5 100644
--- a/tests/test_pagure_flask_ui_no_master_branch.py
+++ b/tests/test_pagure_flask_ui_no_master_branch.py
@@ -220,13 +220,19 @@ class PagureFlaskNoMasterBranchtests(tests.Modeltests):
         output = self.app.get('/test/blob/feature/f/sources')
         self.assertEqual(output.status_code, 200)
         self.assertIn(
-            '<a href="/test/tree/feature">'
-            '<span class="oi" data-glyph="random"></span>&nbsp; feature</a>',
-            output.data)
-        self.assertIn(
-            '</li><li class="active"><span class="oi" data-glyph="file">'
-            '</span>&nbsp; sources</li>',
-            output.data)
+            '''
+        <ol class="breadcrumb">
+          <li>
+            <a href="/test/tree/feature">
+              <span class="oi" data-glyph="random">
+              </span>&nbsp; feature
+            </a>
+          </li>
+          <li class="active">
+            <span class="oi" data-glyph="file">
+            </span>&nbsp; sources
+          </li>
+        </ol>''',  output.data)
         self.assertTrue(
             # new version of pygments
             '<td class="cell2"><pre><span></span>foo</pre></td>' in output.data
diff --git a/tests/test_pagure_flask_ui_repo.py b/tests/test_pagure_flask_ui_repo.py
index 8fd0b94..0adf303 100644
--- a/tests/test_pagure_flask_ui_repo.py
+++ b/tests/test_pagure_flask_ui_repo.py
@@ -1604,9 +1604,16 @@ index 0000000..fb7093d
 
         output = self.app.get('/test/tree/')
         self.assertEqual(output.status_code, 200)
-        self.assertTrue(
-            '<li><a href="/test/tree"><span class="oi" data-glyph="random">'
-            '</span>&nbsp; None</a></li>        </ol>' in output.data)
+        self.assertIn(
+            '''
+        <ol class="breadcrumb">
+          <li>
+            <a href="/test/tree">
+              <span class="oi" data-glyph="random">
+              </span>&nbsp; None
+            </a>
+          </li>
+        </ol>''', output.data)
         self.assertTrue(
             'No content found in this repository' in output.data)
 
@@ -1666,6 +1673,13 @@ index 0000000..fb7093d
         self.assertFalse(
             'No content found in this repository' in output.data)
 
+        output = self.app.get(
+            '/fork/pingou/test3/blob/master/f/folder1/folder2')
+        self.assertEqual(output.status_code, 200)
+        self.assertTrue(
+            '<a href="/fork/pingou/test3/blob/master/'
+            'f/folder1/folder2/file%C5%A0">' in output.data)
+
 
     @patch('pagure.lib.notify.send_email')
     @patch('pagure.ui.repo.admin_session_timedout')
diff --git a/tests/test_pagure_flask_ui_slash_branch_name.py b/tests/test_pagure_flask_ui_slash_branch_name.py
index 17ec396..c0abc07 100644
--- a/tests/test_pagure_flask_ui_slash_branch_name.py
+++ b/tests/test_pagure_flask_ui_slash_branch_name.py
@@ -209,11 +209,19 @@ class PagureFlaskSlashInBranchtests(tests.Modeltests):
         output = self.app.get('/test/blob/master/f/sources')
         self.assertEqual(output.status_code, 200)
         self.assertIn(
-            '<li><a href="/test/tree/master"><span class="oi" '
-            'data-glyph="random"></span>&nbsp; master</a></li>'
-            '<li class="active"><span class="oi" data-glyph="file">'
-            '</span>&nbsp; sources</li>',
-            output.data)
+            '''
+        <ol class="breadcrumb">
+          <li>
+            <a href="/test/tree/master">
+              <span class="oi" data-glyph="random">
+              </span>&nbsp; master
+            </a>
+          </li>
+          <li class="active">
+            <span class="oi" data-glyph="file">
+            </span>&nbsp; sources
+          </li>
+        </ol>''', output.data)
 
         output = self.app.get('/test/blob/master/f/.gitignore')
         self.assertEqual(output.status_code, 404)
@@ -221,12 +229,19 @@ class PagureFlaskSlashInBranchtests(tests.Modeltests):
         output = self.app.get('/test/blob/maxamilion/feature/f/.gitignore')
         self.assertEqual(output.status_code, 200)
         self.assertIn(
-            '<li><a href="/test/tree/maxamilion/feature">'
-            '<span class="oi" data-glyph="random"></span>'
-            '&nbsp; maxamilion/feature</a></li>'
-            '<li class="active"><span class="oi" data-glyph="file">'
-            '</span>&nbsp; .gitignore</li>',
-            output.data)
+            '''
+        <ol class="breadcrumb">
+          <li>
+            <a href="/test/tree/maxamilion/feature">
+              <span class="oi" data-glyph="random">
+              </span>&nbsp; maxamilion/feature
+            </a>
+          </li>
+          <li class="active">
+            <span class="oi" data-glyph="file">
+            </span>&nbsp; .gitignore
+          </li>
+        </ol>''', output.data)
         self.assertTrue(
             # new version of pygments
             '<td class="cell2"><pre><span></span>*~</pre></td>' in output.data