diff --git a/apps/common/templates/generic_navigation.html b/apps/common/templates/generic_navigation.html
index b18bd8a1d9..940834fa4e 100755
--- a/apps/common/templates/generic_navigation.html
+++ b/apps/common/templates/generic_navigation.html
@@ -1,6 +1,7 @@
 {% load i18n %}
 {% load permission_tags %}
 
+<div class="nowrap">
 {% for link in object_navigation_links %}
 {% if link.permissions %}
     {% check_permissions request.user link.permissions.namespace link.permissions.permissions %}
@@ -15,3 +16,4 @@
     {% if as_li %}</li>{% endif %}    
 {% endif %}
 {% endfor %}
+</div>
diff --git a/docs/Changelog.txt b/docs/Changelog.txt
index 7959bf4a8f..bfbcc38ee4 100644
--- a/docs/Changelog.txt
+++ b/docs/Changelog.txt
@@ -47,3 +47,4 @@
 2011-Mar 03
 * Added document link in the OCR document queue list
 * Link to manually re queue failed OCR
+* Don't separate links (encose object list links with white-space: nowrap;)
diff --git a/site_media/css/override.css b/site_media/css/override.css
index 6aee5182c9..bb1ceff2ef 100755
--- a/site_media/css/override.css
+++ b/site_media/css/override.css
@@ -10,3 +10,6 @@
   line-height: 23px;
 }
  
+.nowrap {
+    white-space: nowrap;
+}