diff --git a/source/web/WEB-INF/faces-config-navigation.xml b/source/web/WEB-INF/faces-config-navigation.xml
index cd614b523e..cd25917e57 100644
--- a/source/web/WEB-INF/faces-config-navigation.xml
+++ b/source/web/WEB-INF/faces-config-navigation.xml
@@ -98,10 +98,9 @@
       </navigation-case>
    </navigation-rule>
    
-   <!-- Browse screen action outcomes -->
+   <!-- Common document actions available from anywhere -->
    <navigation-rule>
-      <from-view-id>/jsp/browse/browse.jsp</from-view-id>
-      <!-- showDocDetails and showSpaceDetails moved to /jsp/* above -->
+      <from-view-id>/jsp/*</from-view-id>
       <navigation-case>
          <from-outcome>checkoutFile</from-outcome>
          <to-view-id>/jsp/dialog/checkout-file.jsp</to-view-id>
@@ -130,6 +129,13 @@
          <from-outcome>editTextInline</from-outcome>
          <to-view-id>/jsp/dialog/edit-text-inline.jsp</to-view-id>
       </navigation-case>
+   </navigation-rule>
+   
+   <!-- Browse screen action outcomes -->
+   <navigation-rule>
+      <from-view-id>/jsp/browse/browse.jsp</from-view-id>
+      <!-- showDocDetails and showSpaceDetails moved to /jsp/* above -->
+      <!-- edit, update, checkout actions moved to /jsp/* above -->
       <navigation-case>
          <from-outcome>manageInvitedUsers</from-outcome>
          <to-view-id>/jsp/roles/manage-invited-users.jsp</to-view-id>
@@ -299,34 +305,6 @@
    
    <navigation-rule>
       <from-view-id>/jsp/dialog/document-details.jsp</from-view-id>
-      <navigation-case>
-         <from-outcome>checkoutFile</from-outcome>
-         <to-view-id>/jsp/dialog/checkout-file.jsp</to-view-id>
-      </navigation-case>
-      <navigation-case>
-         <from-outcome>checkinFile</from-outcome>
-         <to-view-id>/jsp/dialog/checkin-file.jsp</to-view-id>
-      </navigation-case>
-      <navigation-case>
-         <from-outcome>undoCheckoutFile</from-outcome>
-         <to-view-id>/jsp/dialog/undocheckout-file.jsp</to-view-id>
-      </navigation-case>
-      <navigation-case>
-         <from-outcome>updateFile</from-outcome>
-         <to-view-id>/jsp/dialog/update-file.jsp</to-view-id>
-      </navigation-case>
-      <navigation-case>
-         <from-outcome>editFile</from-outcome>
-         <to-view-id>/jsp/dialog/edit-file.jsp</to-view-id>
-      </navigation-case>
-      <navigation-case>
-         <from-outcome>editHtmlInline</from-outcome>
-         <to-view-id>/jsp/dialog/edit-html-inline.jsp</to-view-id>
-      </navigation-case>
-      <navigation-case>
-         <from-outcome>editTextInline</from-outcome>
-         <to-view-id>/jsp/dialog/edit-text-inline.jsp</to-view-id>
-      </navigation-case>
       <navigation-case>
          <from-outcome>editSimpleWorkflow</from-outcome>
          <to-view-id>/jsp/dialog/edit-simple-workflow.jsp</to-view-id>
@@ -878,37 +856,6 @@
          <from-outcome>topicDeleted</from-outcome>
          <to-view-id>/jsp/forums/forum.jsp</to-view-id>
       </navigation-case>
-   
-      <!-- Workflow navigation rules for actions on workflow package items -->
-   
-      <navigation-case>
-         <from-outcome>checkoutFile</from-outcome>
-         <to-view-id>/jsp/dialog/checkout-file.jsp</to-view-id>
-      </navigation-case>
-      <navigation-case>
-         <from-outcome>checkinFile</from-outcome>
-         <to-view-id>/jsp/dialog/checkin-file.jsp</to-view-id>
-      </navigation-case>
-      <navigation-case>
-         <from-outcome>undoCheckoutFile</from-outcome>
-         <to-view-id>/jsp/dialog/undocheckout-file.jsp</to-view-id>
-      </navigation-case>
-      <navigation-case>
-         <from-outcome>updateFile</from-outcome>
-         <to-view-id>/jsp/dialog/update-file.jsp</to-view-id>
-      </navigation-case>
-      <navigation-case>
-         <from-outcome>editFile</from-outcome>
-         <to-view-id>/jsp/dialog/edit-file.jsp</to-view-id>
-      </navigation-case>
-      <navigation-case>
-         <from-outcome>editHtmlInline</from-outcome>
-         <to-view-id>/jsp/dialog/edit-html-inline.jsp</to-view-id>
-      </navigation-case>
-      <navigation-case>
-         <from-outcome>editTextInline</from-outcome>
-         <to-view-id>/jsp/dialog/edit-text-inline.jsp</to-view-id>
-      </navigation-case>
    </navigation-rule>
    
 </faces-config>