diff --git a/apps/documents/__init__.py b/apps/documents/__init__.py
index c78b0431fb..f5e963bb65 100644
--- a/apps/documents/__init__.py
+++ b/apps/documents/__init__.py
@@ -121,14 +121,12 @@ document_type_filename_create = {'text': _(u'add filename to document type'), 'v
 document_type_filename_edit = {'text': _(u'edit'), 'view': 'document_type_filename_edit', 'args': 'filename.id', 'famfam': 'database_edit', 'permissions': [PERMISSION_DOCUMENT_TYPE_EDIT]}
 document_type_filename_delete = {'text': _(u'delete'), 'view': 'document_type_filename_delete', 'args': 'filename.id', 'famfam': 'database_delete', 'permissions': [PERMISSION_DOCUMENT_TYPE_EDIT]}
 
-document_type_views = ['setup_document_type_metadata', 'document_type_list', 'document_type_document_list', 'document_type_edit', 'document_type_delete', 'document_type_create', 'document_type_filename_list', 'document_type_filename_create', 'document_type_filename_edit', 'document_type_filename_delete']
-
 # Register document type links
 register_links(DocumentType, [document_type_document_list, document_type_filename_list, document_type_edit, document_type_delete])
 register_links(DocumentTypeFilename, [document_type_filename_edit, document_type_filename_delete])
 
-register_links(['setup_document_type_metadata', 'document_type_filename_delete', 'document_type_create', 'document_type_filename_create', 'document_type_filename_edit', 'document_type_filename_list', 'document_type_list', 'document_type_document_list', 'document_type_edit', 'document_type_delete'], [document_type_list, document_type_create], menu_name='sidebar')
-register_links(['document_type_filename_create', 'document_type_filename_list', 'document_type_filename_edit', 'document_type_filename_delete'], [document_type_filename_create], menu_name='sidebar')
+register_links(['setup_document_type_metadata', 'document_type_filename_delete', 'document_type_create', 'document_type_filename_create', 'document_type_filename_edit', 'document_type_filename_list', 'document_type_list', 'document_type_document_list', 'document_type_edit', 'document_type_delete'], [document_type_list, document_type_create], menu_name='secondary_menu')
+register_links([DocumentType], [document_type_filename_create], menu_name='sidebar')
 
 # Register document links
 register_links(Document, [document_view_simple, document_edit, document_print, document_delete, document_download, document_find_duplicates, document_clear_transformations, document_create_siblings])
diff --git a/apps/documents/views.py b/apps/documents/views.py
index 3b19744f4e..a323dc5229 100644
--- a/apps/documents/views.py
+++ b/apps/documents/views.py
@@ -1292,6 +1292,9 @@ def document_type_filename_create(request, document_type_id):
         'title': _(u'create filename for document type: %s') % document_type,
         'form': form,
         'document_type': document_type,
+        'navigation_object_list': [
+            {'object': 'document_type', 'name': _(u'document type')},
+        ],        
     },
     context_instance=RequestContext(request))