diff --git a/trac/htdocs/css/diff.css b/trac/htdocs/css/diff.css
index 828f75aea2..5123111dcd 100644
--- a/trac/htdocs/css/diff.css
+++ b/trac/htdocs/css/diff.css
@@ -218,3 +218,4 @@ pre.diff .add { background: #dfd; }
 
 /* Styles for the diff page */
 .trac-autocomplete-dir { font-weight: bold }
+.trac-autocomplete-dir .ui-state-active { font-weight: inherit }
diff --git a/trac/versioncontrol/templates/diff_form.html b/trac/versioncontrol/templates/diff_form.html
index e2209d97a2..b6eedda07a 100644
--- a/trac/versioncontrol/templates/diff_form.html
+++ b/trac/versioncontrol/templates/diff_form.html
@@ -23,20 +23,18 @@
     ${ super() }
     <script>
       jQuery(function($) {
-        $("#anydiff input[name$='_path']").autocomplete({
-          source: window.location.pathname
-        }).each(function() {
-          $(this).data("ui-autocomplete")._renderItem = function(ul, item) {
-            return $("<li>")
-              .data("ui-autocomplete-item", item.value)
-              .addClass(function() {
-                return item.isdir ? "trac-autocomplete-dir"
-                                  : "trac-autocomplete-file";
-              })
-              .append(item.label)
-              .appendTo(ul);
-          }
-        })
+        var _renderItem = function(ul, item) {
+          return $("<li>")
+            .addClass(item.isdir ? "trac-autocomplete-dir"
+                                 : "trac-autocomplete-file")
+            .append($("<div>").append(item.label))  // ui-menu-item-wrapper
+            .appendTo(ul);
+        };
+        $("#anydiff input[name$='_path']")
+          .autocomplete({source: window.location.pathname})
+          .each(function() {
+            $(this).autocomplete("instance")._renderItem = _renderItem;
+          });
       });
     </script>
     # endblock head
diff --git a/trac/versioncontrol/web_ui/changeset.py b/trac/versioncontrol/web_ui/changeset.py
index 30fdc860e7..b17a22c50e 100644
--- a/trac/versioncontrol/web_ui/changeset.py
+++ b/trac/versioncontrol/web_ui/changeset.py
@@ -1189,7 +1189,8 @@ def kind_order(entry):
             if not reponame:
                 entries.extend((True, repos.reponame, '/' + repos.reponame)
                                for repos in rm.get_real_repositories()
-                               if repos.is_viewable(req.perm))
+                               if repos.reponame and
+                                  repos.is_viewable(req.perm))
 
             paths = [{'label': path + ('/' if isdir else ''), 'value': path,
                       'isdir': isdir}