diff --git a/colab/proxy/templates/proxy/menu_template.html b/colab/proxy/templates/proxy/menu_template.html
index 226a95e..f24f797 100644
--- a/colab/proxy/templates/proxy/menu_template.html
+++ b/colab/proxy/templates/proxy/menu_template.html
@@ -1,10 +1,18 @@
 {% for title, links in menu_links.items %}
-<li class="dropdown">
-  <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{ title }} <b class="caret"></b></a>
-  <ul class="dropdown-menu">
+  {% if links|length == 1 %}
     {% for text, link in links %}
-      <li><a href="{{ link }}">{{ text }}</a></li>
+      <li>
+        <a href="{{ link }}">{{ title }}</a>
+      </li>
     {% endfor %}
-  </ul>
-</li>
+  {% else %}
+    <li class="dropdown">
+      <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{ title }} <b class="caret"></b></a>
+      <ul class="dropdown-menu">
+        {% for text, link in links %}
+          <li><a href="{{ link }}">{{ text }}</a></li>
+        {% endfor %}
+      </ul>
+    </li>
+  {% endif %}
 {% endfor %}
diff --git a/colab/proxy/templatetags/proxy.py b/colab/proxy/templatetags/proxy.py
index e2251bf..6d032a6 100644
--- a/colab/proxy/templatetags/proxy.py
+++ b/colab/proxy/templatetags/proxy.py
@@ -1,3 +1,4 @@
+from collections import OrderedDict
 
 from django.core.urlresolvers import reverse
 from django import template
@@ -19,7 +20,7 @@ def proxy_menu(context):
     if menu_from_cache:
         return menu_from_cache
 
-    menu_links = {}
+    menu_links = OrderedDict()
     proxied_apps = context.get('proxy', {})
 
     for app_name, app in proxied_apps.items():
--
libgit2 0.21.2