diff --git a/packages/Webkul/Admin/src/Resources/views/cms/create.blade.php b/packages/Webkul/Admin/src/Resources/views/cms/create.blade.php
index 768dd4a5e..52dede384 100644
--- a/packages/Webkul/Admin/src/Resources/views/cms/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/cms/create.blade.php
@@ -77,9 +77,9 @@
                         {!! __('admin::app.cms.pages.three-col') !!}
 
                         <div class="mt-10 mb-10" @submit.prevent="showModal('showHelpers')">
-                            <button class="btn btn-sm btn-primary">
+                            <a class="btn btn-sm btn-primary">
                                 {{ __('admin::app.cms.pages.helper-classes') }}
-                            </button>
+                            </a>
                         </div>
 
                         <span class="control-error" v-if="errors.has('html_content')">@{{ errors.first('html_content') }}</span>
diff --git a/packages/Webkul/CMS/src/Http/Controllers/Shop/PagePresenterController.php b/packages/Webkul/CMS/src/Http/Controllers/Shop/PagePresenterController.php
index b02dc360a..b7e54981a 100644
--- a/packages/Webkul/CMS/src/Http/Controllers/Shop/PagePresenterController.php
+++ b/packages/Webkul/CMS/src/Http/Controllers/Shop/PagePresenterController.php
@@ -75,6 +75,11 @@ use Webkul\Core\Repositories\LocaleRepository as Locale;
             'channel_id' => $currentChannel->id
         ]);
 
-        return view('shop::cms.page')->with('page', $page);
+        if ($page) {
+            return view('shop::cms.page')->with('page', $page);
+        } else {
+            abort(404);
+        }
+
     }
 }
\ No newline at end of file