diff --git a/engine/core/class/CodePressCMS.php b/engine/core/class/CodePressCMS.php
index 8a5be37..4d0167e 100644
--- a/engine/core/class/CodePressCMS.php
+++ b/engine/core/class/CodePressCMS.php
@@ -626,7 +626,7 @@ class CodePressCMS {
      * @return array Guide page data
      */
     private function getGuidePage() {
-        $lang = $this->detectLanguage();
+        $lang = $this->currentLanguage;
         $guideFile = __DIR__ . '/../../../guide/' . $lang . '.md';
         
         if (!file_exists($guideFile)) {
@@ -796,6 +796,8 @@ class CodePressCMS {
             'homepage_title' => $homepageTitle,
             'is_homepage' => (!isset($_GET['page']) || $_GET['page'] === $this->config['default_page']),
             'home_active_class' => (!isset($_GET['page']) || $_GET['page'] === $this->config['default_page']) ? 'active' : '',
+            'is_guide_page' => isset($_GET['guide']),
+            'lang_switch_url' => isset($_GET['guide']) ? '&guide' : '&page=' . $this->config['default_page'],
             'author_name' => $this->config['author']['name'] ?? 'CodePress Developer',
             'author_website' => $this->config['author']['website'] ?? '#',
             'author_git' => $this->config['author']['git'] ?? '#',
diff --git a/engine/templates/assets/header.mustache b/engine/templates/assets/header.mustache
index 4570c0c..ae98a2d 100644
--- a/engine/templates/assets/header.mustache
+++ b/engine/templates/assets/header.mustache
@@ -18,8 +18,8 @@
                     {{current_lang_upper}} <i class="bi bi-chevron-down"></i>
                 </button>
                 <ul class="dropdown-menu dropdown-menu-end">
-                    <li><a class="dropdown-item" href="?lang=nl&page={{homepage}}">NL</a></li>
-                    <li><a class="dropdown-item" href="?lang=en&page={{homepage}}">EN</a></li>
+                    <li><a class="dropdown-item" href="?lang=nl{{lang_switch_url}}">NL</a></li>
+                    <li><a class="dropdown-item" href="?lang=en{{lang_switch_url}}">EN</a></li>
                 </ul>
             </div>
         </div>
@@ -33,8 +33,8 @@
                 {{current_lang_upper}} <i class="bi bi-chevron-down"></i>
             </button>
             <ul class="dropdown-menu dropdown-menu-end">
-                <li><a class="dropdown-item" href="?lang=nl&page={{homepage}}">NL</a></li>
-                <li><a class="dropdown-item" href="?lang=en&page={{homepage}}">EN</a></li>
+                    <li><a class="dropdown-item" href="?lang=nl{{lang_switch_url}}">NL</a></li>
+                    <li><a class="dropdown-item" href="?lang=en{{lang_switch_url}}">EN</a></li>
             </ul>
         </div>
     </div>