diff --git a/packages/Webkul/Shop/src/Http/Middleware/Theme.php b/packages/Webkul/Shop/src/Http/Middleware/Theme.php
index 10da4aa7a..137858659 100755
--- a/packages/Webkul/Shop/src/Http/Middleware/Theme.php
+++ b/packages/Webkul/Shop/src/Http/Middleware/Theme.php
@@ -15,13 +15,17 @@ class Theme
     */
     public function handle($request, Closure $next)
     {
-        $theme = app('themes');
+        $themes = app('themes');
         $channel = core()->getCurrentChannel();
 
         if ($channel && $channelThemeCode = $channel->theme) {
-            if ($theme->exists($channelThemeCode)) {
-                $theme->set($channelThemeCode);
+            if ($themes->exists($channelThemeCode)) {
+                $themes->set($channelThemeCode);
+            } else {
+                $themes->set(config('themes.default'));
             }
+        } else {
+            $themes->set(config('themes.default'));
         }
 
         return $next($request);
diff --git a/packages/Webkul/Shop/src/Providers/ShopServiceProvider.php b/packages/Webkul/Shop/src/Providers/ShopServiceProvider.php
index b23f060cc..a34d29844 100755
--- a/packages/Webkul/Shop/src/Providers/ShopServiceProvider.php
+++ b/packages/Webkul/Shop/src/Providers/ShopServiceProvider.php
@@ -53,12 +53,6 @@ class ShopServiceProvider extends ServiceProvider
      */
     public function register()
     {
-        $themes = $this->app->make('themes');
-
-        if (! $themes->current() && \Config::get('themes.default')) {
-            $themes->set(\Config::get('themes.default'));
-        }
-
         $this->registerConfig();
     }
 
diff --git a/packages/Webkul/Theme/src/ThemeViewFinder.php b/packages/Webkul/Theme/src/ThemeViewFinder.php
index 0f4a57e56..20d160aec 100755
--- a/packages/Webkul/Theme/src/ThemeViewFinder.php
+++ b/packages/Webkul/Theme/src/ThemeViewFinder.php
@@ -19,10 +19,14 @@ class ThemeViewFinder extends FileViewFinder
         // Extract the $view and the $namespace parts
         list($namespace, $view) = $this->parseNamespaceSegments($name);
         
-        $paths = $this->addThemeNamespacePaths($namespace);
+        if ($namespace != 'admin') {
+            $paths = $this->addThemeNamespacePaths($namespace);
 
-        // Find and return the view
-        return $this->findInPaths($view, $paths);
+            // Find and return the view
+            return $this->findInPaths($view, $paths);
+        } else {
+            return $this->findInPaths($view, $this->hints[$namespace]);
+        }
     }
 
     public function addThemeNamespacePaths($namespace)