diff --git a/frontend/src/Editor/LeftSidebar/SidebarPageSelector/GlobalSettings.jsx b/frontend/src/Editor/LeftSidebar/SidebarPageSelector/GlobalSettings.jsx
index d2097a4c72..407eb03e02 100644
--- a/frontend/src/Editor/LeftSidebar/SidebarPageSelector/GlobalSettings.jsx
+++ b/frontend/src/Editor/LeftSidebar/SidebarPageSelector/GlobalSettings.jsx
@@ -35,7 +35,7 @@ export const GlobalSettings = ({ darkMode, showHideViewerNavigationControls, sho
               </label>
               <hr style={{ margin: '0.75rem 0' }} />
               <div className="menu-options mb-0">
-                <Toggle onChange={onChange} value={!showPageViwerPageNavitation} />
+                <Toggle onChange={onChange} value={showPageViwerPageNavitation} />
               </div>
             </div>
           </Popover.Body>
diff --git a/frontend/src/Editor/Viewer.jsx b/frontend/src/Editor/Viewer.jsx
index b178f831c6..543fa8c427 100644
--- a/frontend/src/Editor/Viewer.jsx
+++ b/frontend/src/Editor/Viewer.jsx
@@ -86,7 +86,7 @@ class ViewerComponent extends React.Component {
     if (byAppSlug) {
       appDefData.globalSettings = data.globalSettings;
       appDefData.homePageId = data.homePageId;
-      appDefData.showHideViewerNavigation = data.showHideViewerNavigation;
+      appDefData.showViewerNavigation = data.showViewerNavigation;
     }
 
     this.setState({
@@ -567,7 +567,7 @@ class ViewerComponent extends React.Component {
 
     if (appDefinition.globalSettings?.canvasMaxWidthType === 'px')
       computedCanvasMaxWidth =
-        (+appDefinition.globalSettings?.canvasMaxWidth || 1292) - (appDefinition?.showHideViewerNavigation ? 200 : 0);
+        (+appDefinition.globalSettings?.canvasMaxWidth || 1292) - (appDefinition?.showViewerNavigation ? 200 : 0);
     else if (appDefinition.globalSettings?.canvasMaxWidthType === '%')
       computedCanvasMaxWidth = +appDefinition.globalSettings?.canvasMaxWidth + '%';
 
@@ -683,7 +683,7 @@ class ViewerComponent extends React.Component {
                     }}
                   >
                     <div className="areas d-flex flex-rows">
-                      {appDefinition?.showHideViewerNavigation && (
+                      {appDefinition?.showViewerNavigation && (
                         <ViewerNavigation
                           isMobileDevice={this.props.currentLayout === 'mobile'}
                           canvasBackgroundColor={this.computeCanvasBackgroundColor()}
diff --git a/frontend/src/_helpers/appUtils.js b/frontend/src/_helpers/appUtils.js
index 5bfebad7d4..c2164ef039 100644
--- a/frontend/src/_helpers/appUtils.js
+++ b/frontend/src/_helpers/appUtils.js
@@ -1715,7 +1715,7 @@ export const buildAppDefinition = (data) => {
   const appJSON = {
     globalSettings: editingVersion.globalSettings,
     homePageId: editingVersion.homePageId,
-    showHideViewerNavigation: editingVersion.showHideViewerNavigation ?? true,
+    showViewerNavigation: editingVersion.showViewerNavigation ?? true,
     pages: pages,
   };
 
diff --git a/frontend/src/_stores/utils.js b/frontend/src/_stores/utils.js
index fafaa46cd2..371b319779 100644
--- a/frontend/src/_stores/utils.js
+++ b/frontend/src/_stores/utils.js
@@ -123,7 +123,7 @@ const updateFor = (appDiff, currentPageId, opts) => {
       }),
     },
     {
-      updateTypes: ['globalSettings'],
+      updateTypes: ['globalSettings', 'generalAppDefinitionChanged'],
       processingFunction: () => ({
         updateDiff: appDiff,
         type: 'global_settings',
diff --git a/server/migrations/1691004576222-UpdateAppVersionEntity.ts b/server/migrations/1691004576222-UpdateAppVersionEntity.ts
index c1e7fac828..0ef8eb2d6f 100644
--- a/server/migrations/1691004576222-UpdateAppVersionEntity.ts
+++ b/server/migrations/1691004576222-UpdateAppVersionEntity.ts
@@ -17,7 +17,7 @@ export class UpdateAppVersionEntity1691006886222 implements MigrationInterface {
       new TableColumn({
         name: 'show_viewer_navigation',
         type: 'boolean',
-        default: false,
+        default: true,
         isNullable: false,
       })
     );
diff --git a/server/src/controllers/apps.controller.ts b/server/src/controllers/apps.controller.ts
index 75292517b1..cbb426dde2 100644
--- a/server/src/controllers/apps.controller.ts
+++ b/server/src/controllers/apps.controller.ts
@@ -152,7 +152,7 @@ export class AppsController {
       pages: pagesForVersion,
       homePageId: versionToLoad.homePageId,
       globalSettings: versionToLoad.globalSettings,
-      showHideViewerNavigation: versionToLoad.showViewerNavigation,
+      showViewerNavigation: versionToLoad.showViewerNavigation,
     };
   }
 
diff --git a/server/src/controllers/apps.controller.v2.ts b/server/src/controllers/apps.controller.v2.ts
index 3cc5fb86db..1a592a7a64 100644
--- a/server/src/controllers/apps.controller.v2.ts
+++ b/server/src/controllers/apps.controller.v2.ts
@@ -16,7 +16,7 @@ import { JwtAuthGuard } from '../../src/modules/auth/jwt-auth.guard';
 import { AppsService } from '../services/apps.service';
 import { camelizeKeys, decamelizeKeys } from 'humps';
 import { AppsAbilityFactory } from 'src/modules/casl/abilities/apps-ability.factory';
-// import { AppAuthGuard } from 'src/modules/auth/app-auth.guard';
+
 import { App } from 'src/entities/app.entity';
 import { User } from 'src/decorators/user.decorator';
 
diff --git a/server/src/services/apps.service.ts b/server/src/services/apps.service.ts
index ee3211ecc4..945bb06595 100644
--- a/server/src/services/apps.service.ts
+++ b/server/src/services/apps.service.ts
@@ -919,6 +919,10 @@ export class AppsService {
       };
     }
 
+    if (typeof body?.showViewerNavigation === 'boolean') {
+      editableParams['showViewerNavigation'] = body.showViewerNavigation;
+    }
+
     return await this.appVersionsRepository.update(version.id, editableParams);
   }