diff --git a/app/Http/ViewComposers/Header.php b/app/Http/ViewComposers/Header.php
index 4f8078df0..2a6d9cb0a 100644
--- a/app/Http/ViewComposers/Header.php
+++ b/app/Http/ViewComposers/Header.php
@@ -5,11 +5,11 @@ namespace App\Http\ViewComposers;
 use Auth;
 use App\Utilities\Updater;
 use Illuminate\View\View;
-use App\Traits\Modules;
+use App\Traits\Modules as RemoteModules;
 
 class Header
 {
-    use Modules;
+    use RemoteModules;
 
     /**
      * Bind data to the view.
@@ -60,9 +60,7 @@ class Header
 
         $updates = count(Updater::all());
 
-        if (!env('APP_INSTALLED', false)) {
-            $this->loadSuggestions();
-        }
+        $this->loadSuggestions();
 
         $view->with([
             'user' => $user,
diff --git a/app/Http/ViewComposers/Suggestions.php b/app/Http/ViewComposers/Suggestions.php
index 37067b763..22b0ae47f 100644
--- a/app/Http/ViewComposers/Suggestions.php
+++ b/app/Http/ViewComposers/Suggestions.php
@@ -20,7 +20,7 @@ class Suggestions
     public function compose(View $view)
     {
         // No need to add suggestions in console
-        if (app()->runningInConsole() || !env('APP_INSTALLED', false)) {
+        if (app()->runningInConsole() || !env('APP_INSTALLED')) {
             return;
         }
 
diff --git a/app/Providers/ViewComposerServiceProvider.php b/app/Providers/ViewComposerServiceProvider.php
index b9088c412..5082a0782 100644
--- a/app/Providers/ViewComposerServiceProvider.php
+++ b/app/Providers/ViewComposerServiceProvider.php
@@ -21,7 +21,7 @@ class ViewComposerServiceProvider extends ServiceProvider
 
         // Suggestions
         View::composer(
-            '*', 'App\Http\ViewComposers\Suggestions'
+            ['partials.admin.header'], 'App\Http\ViewComposers\Suggestions'
         );
 
         // Add company info to menu