diff --git a/qutebrowser/browser/dirbrowser.py b/qutebrowser/browser/dirbrowser.py
index c079a5cfb..1b7a2bd92 100644
--- a/qutebrowser/browser/dirbrowser.py
+++ b/qutebrowser/browser/dirbrowser.py
@@ -49,10 +49,12 @@ def dirbrowser(url):
     else:
         parent = os.path.dirname(url)
     all_files = os.listdir(url)
-    files = sorted([(file, os.path.join(url, file)) for file in all_files if
-                    is_file(file)])
-    directories = sorted([(file, os.path.join(url, file)) for file in
-                          all_files if is_dir(file)])
+    files = sorted([{'name': file, 'absname': os.path.join(url, file)}
+                   for file in all_files if is_file(file)],
+                   key=lambda v: v['name'].lower())
+    directories = sorted([{'name': file, 'absname': os.path.join(url, file)}
+                         for file in all_files if is_dir(file)],
+                         key=lambda v: v['name'].lower())
     html = template.render(title=title, url=url, icon='', parent=parent,
                            files=files, directories=directories)
     return html
diff --git a/qutebrowser/html/dirbrowser.html b/qutebrowser/html/dirbrowser.html
index 19659caf5..d5fefc489 100644
--- a/qutebrowser/html/dirbrowser.html
+++ b/qutebrowser/html/dirbrowser.html
@@ -31,11 +31,11 @@
             {% endif %}
 
             {% for item in directories %}
-                <li><a href="file://{{item.1}}">{{item.0}}</a></li>
+                <li><a href="file://{{item.absname}}">{{item.name}}</a></li>
             {% endfor %}
 
             {% for item in files %}
-                <li><a href="file://{{item.1}}">{{item.0}}</a></li>
+                <li><a href="file://{{item.absname}}">{{item.name}}</a></li>
             {% endfor %}
         </ul>
     </div>