diff --git a/lib/private/navigationmanager.php b/lib/private/navigationmanager.php
index 8ad2f4c8f6..205ecccd50 100644
--- a/lib/private/navigationmanager.php
+++ b/lib/private/navigationmanager.php
@@ -14,13 +14,23 @@ namespace OC;
  */
 class NavigationManager implements \OCP\INavigationManager {
 	protected $entries = array();
+	protected $closureEntries = array();
 	protected $activeEntry;
 
 	/**
 	 * Creates a new navigation entry
-	 * @param array $entry containing: id, name, order, icon and href key
+	 *
+	 * @param array|\Closure $entry Array containing: id, name, order, icon and href key
+	 *					The use of a closure is preferred, because it will avoid
+	 * 					loading the routing of your app, unless required.
+	 * @return void
 	 */
-	public function add(array $entry) {
+	public function add($entry) {
+		if ($entry instanceof \Closure) {
+			$this->closureEntries[] = $entry;
+			return;
+		}
+
 		$entry['active'] = false;
 		if(!isset($entry['icon'])) {
 			$entry['icon'] = '';
@@ -33,6 +43,10 @@ class NavigationManager implements \OCP\INavigationManager {
 	 * @return array an array of the added entries
 	 */
 	public function getAll() {
+		foreach ($this->closureEntries as $c) {
+			$this->add($c());
+		}
+		$this->closureEntries = array();
 		return $this->entries;
 	}
 
@@ -41,6 +55,7 @@ class NavigationManager implements \OCP\INavigationManager {
 	 */
 	public function clear() {
 		$this->entries = array();
+		$this->closureEntries = array();
 	}
 
 	/**
diff --git a/lib/public/inavigationmanager.php b/lib/public/inavigationmanager.php
index 9497d3fd08..9e0e682645 100644
--- a/lib/public/inavigationmanager.php
+++ b/lib/public/inavigationmanager.php
@@ -36,10 +36,13 @@ namespace OCP;
 interface INavigationManager {
 	/**
 	 * Creates a new navigation entry
-	 * @param array $entry containing: id, name, order, icon and href key
+	 *
+	 * @param array|\Closure $entry Array containing: id, name, order, icon and href key
+	 *					The use of a closure is preferred, because it will avoid
+	 * 					loading the routing of your app, unless required.
 	 * @return void
 	 */
-	public function add(array $entry);
+	public function add($entry);
 
 	/**
 	 * Sets the current navigation entry of the currently running app