diff --git a/lib/Controller/CssController.php b/lib/Controller/CssController.php
index 6210dc0..c534161 100644
--- a/lib/Controller/CssController.php
+++ b/lib/Controller/CssController.php
@@ -26,7 +26,6 @@ use OCP\IRequest;
 
 class CssController extends Controller
 {
-
     /**
      * @var \OCP\IConfig
      */
diff --git a/lib/Controller/NavController.php b/lib/Controller/NavController.php
index 36b3451..818b700 100644
--- a/lib/Controller/NavController.php
+++ b/lib/Controller/NavController.php
@@ -31,7 +31,7 @@ use OC\URLGenerator;
 class NavController extends Controller
 {
     /**
-     * @var \OCP\IConfig
+     * @var IConfig
      */
     protected $config;
 
@@ -95,6 +95,7 @@ class NavController extends Controller
         $apps = $this->appRepository->getVisibleApps();
         $currentLanguage = substr($this->l10nFactory->findLanguage(), 0, 2);
         $categoriesLabels = $this->categoryFetcher->get();
+        $externalSitesInTopMenu = (bool) $this->config->getAppValue('side_menu', 'external-sites-in-top-menu', 0);
         $appsCategories = [];
         $categoriesAppsCount = [];
         $items = [];
@@ -105,11 +106,17 @@ class NavController extends Controller
             unset($categoriesLabels[$k]);
         }
 
+        $categoriesLabels['external_links'] = $this->trans->t('External sites');
+
         foreach ($apps as $app) {
             $categories = (array) $app['category'];
             $appsCategories[$app['id']] = [];
 
             foreach ($categories as $category) {
+                if ($externalSitesInTopMenu && $category === 'external_links') {
+                    continue;
+                }
+
                 if (!isset($items[$category])) {
                     $items[$category] = [
                         'name' => $categoriesLabels[$category],
diff --git a/lib/Service/AppRepository.php b/lib/Service/AppRepository.php
index bb202e3..bfe5085 100644
--- a/lib/Service/AppRepository.php
+++ b/lib/Service/AppRepository.php
@@ -43,6 +43,20 @@ class AppRepository
             }
         }
 
+        foreach ($navigation as $app) {
+            if (substr($app['id'], 0, 14) === 'external_index') {
+                $visibleApps[$app['id']] = [
+                    'id' => $app['id'],
+                    'name' => $app['name'],
+                    'preview' => $app['icon'],
+                    'previewAsIcon' => true,
+                    'category' => [
+                        'external_links',
+                    ],
+                ];
+            }
+        }
+
         return $visibleApps;
     }
 }
diff --git a/templates/settings/admin-form.php b/templates/settings/admin-form.php
index e56932f..b76e650 100644
--- a/templates/settings/admin-form.php
+++ b/templates/settings/admin-form.php
@@ -319,7 +319,7 @@ $choicesSizes = [
             </label>
         </div>
 
-        <p><em>This feature is not compatible with the <code>big menu</code> display.</em></p>
+        <p><em>Should be enabled with the <code>big menu</code> display.</em></p>
 
         <div>
             <select id="side-menu-external-sites-in-top-menu" name="external-sites-in-top-menu" class="side-menu-setting">