diff --git a/frontend/components.d.ts b/frontend/components.d.ts
index 8bf2e8b4..320efff0 100644
--- a/frontend/components.d.ts
+++ b/frontend/components.d.ts
@@ -56,7 +56,6 @@ declare module 'vue' {
     Input: typeof import('./src/components/Input.vue')['default']
     InputLabel: typeof import('./src/components/InputLabel.vue')['default']
     Link: typeof import('./src/components/Link.vue')['default']
-    LucideChevronRight: typeof import('~icons/lucide/chevron-right')['default']
     MarginHandler: typeof import('./src/components/MarginHandler.vue')['default']
     MarkdownEditor: typeof import('./src/components/AppLayout/MarkdownEditor.vue')['default']
     NewComponentDialog: typeof import('./src/components/NewComponentDialog.vue')['default']
diff --git a/frontend/src/components/StudioCanvas.vue b/frontend/src/components/StudioCanvas.vue
index 9e8b9979..04977fa8 100644
--- a/frontend/src/components/StudioCanvas.vue
+++ b/frontend/src/components/StudioCanvas.vue
@@ -20,6 +20,8 @@
 			class="fixed flex gap-40"
 			:class="canvasStore.editingMode === 'page' ? 'h-full' : ''"
 			ref="canvas"
+			@mouseenter="isCanvasActive = true"
+ 			@mouseleave="isCanvasActive = false"
 			:style="{
 				transformOrigin: 'top center',
 				transform: `scale(${canvasProps.scale}) translate(${canvasProps.translateX}px, ${canvasProps.translateY}px)`,
@@ -76,22 +78,35 @@
 		</div>
 
 		<div
-			class="fixed bottom-12 left-[50%] z-40 flex translate-x-[-50%] cursor-default items-center justify-center gap-2 rounded-lg bg-white px-3 py-2 text-center text-sm font-semibold text-gray-600 shadow-md"
+			class="fixed bottom-12 left-[50%] z-40 flex translate-x-[-50%] cursor-default items-center justify-center gap-3 rounded-lg bg-white px-4 py-2 text-center text-sm font-semibold text-gray-600 shadow-md"
 			v-show="!canvasProps.panning"
 		>
+			<!-- Zoom Percentage -->
 			{{ Math.round(canvasProps.scale * 100) + "%" }}
-			<div class="ml-2 cursor-pointer" @click="setScaleAndTranslate">
-				<FitScreenIcon />
-			</div>
+
+			<!-- Zoom Out -->
+				<span title="Zoom Out (-)">
+				<FeatherIcon name="minus" class="h-4 w-4 cursor-pointer" @click="zoomOut" />
+			</span>
+
+			<!-- Zoom In -->
+			<span title="Zoom In (+)">
+				<FeatherIcon name="plus" class="h-4 w-4 cursor-pointer" @click="zoomIn" />
+			</span>
+
+			<!-- Fit to Screen -->
+			<span title="Fit to Screen (0)" >
+				<FeatherIcon name="maximize" class="h-4 w-4 cursor-pointer" @click="setScaleAndTranslate"/>
+			</span>
+
 		</div>
 	</div>
 </template>
 
 <script setup lang="ts">
-import { Ref, ref, watch, reactive, computed, onMounted, provide } from "vue"
+import { Ref, ref, watch, reactive, computed, onMounted, provide, onBeforeUnmount } from "vue"
 import { LoadingIndicator } from "frappe-ui"
 import StudioComponent from "@/components/StudioComponent.vue"
-import FitScreenIcon from "@/components/Icons/FitScreenIcon.vue"
 
 import useStudioStore from "@/stores/studioStore"
 import useCanvasStore from "@/stores/canvasStore"
@@ -121,6 +136,7 @@ const canvasContainer = ref(null)
 const canvas = ref<HTMLElement | null>(null)
 const overlay = ref(null)
 const showBlocks = ref(false)
+const isCanvasActive = ref(false)
 
 const canvasProps = reactive({
 	overlayElement: null,
@@ -282,7 +298,15 @@ onMounted(() => {
 	const canvasContainerEl = canvasContainer.value as unknown as HTMLElement
 	const canvasEl = canvas.value as unknown as HTMLElement
 	canvasProps.overlayElement = overlay.value
-	setScaleAndTranslate()
+
+	// Restore saved zoom level
+	const savedZoom = parseFloat(localStorage.getItem("studioCanvasZoom") || "1")
+	const isZoomRestored = !isNaN(savedZoom) && savedZoom >= 0.2 && savedZoom <= 2
+	if (isZoomRestored) {
+		canvasProps.scale = savedZoom
+	}
+
+	setScaleAndTranslate(false, !isZoomRestored)
 	showBlocks.value = true
 	setupHistory()
 	useCanvasEvents(
@@ -296,6 +320,22 @@ onMounted(() => {
 	setPanAndZoom(canvasEl, canvasContainerEl, canvasProps)
 })
 
+function zoomIn() {
+	if (canvasProps.scale < 2) {
+		canvasProps.scale = +(canvasProps.scale + 0.1).toFixed(2)
+		localStorage.setItem("studioCanvasZoom", canvasProps.scale.toString())
+	}
+}
+
+function zoomOut() {
+	if (canvasProps.scale > 0.2) {
+		canvasProps.scale = +(canvasProps.scale - 0.1).toFixed(2)
+		localStorage.setItem("studioCanvasZoom", canvasProps.scale.toString())
+	}
+}
+
+
+
 defineExpose({
 	history,
 	rootComponent,
@@ -305,6 +345,10 @@ defineExpose({
 	removeBlock,
 	getRootBlock,
 	setRootBlock,
+	// zoom methods
+	zoomIn,
+	zoomOut,
+	setScaleAndTranslate,
 	// block hover & selection
 	hoveredBlock,
 	hoveredBreakpoint,
diff --git a/frontend/src/utils/useCanvasUtils.ts b/frontend/src/utils/useCanvasUtils.ts
index 9924ff5b..dbdb8a5e 100644
--- a/frontend/src/utils/useCanvasUtils.ts
+++ b/frontend/src/utils/useCanvasUtils.ts
@@ -21,7 +21,7 @@ export function useCanvasUtils(
 	// canvas positioning
 	const containerBound = reactive(useElementBounding(canvasContainer));
 	const canvasBound = reactive(useElementBounding(canvas));
-	const setScaleAndTranslate = async () => {
+	const setScaleAndTranslate = async (persist = true, overrideScale = true) => {
 		if (document.readyState !== "complete") {
 			await new Promise((resolve) => {
 				window.addEventListener("load", resolve);
@@ -35,7 +35,12 @@ export function useCanvasUtils(
 		const containerWidth = containerBound.width;
 		const canvasWidth = canvasBound.width / canvasProps.scale;
 
-		canvasProps.scale = containerWidth / (canvasWidth + paddingX * 2);
+		if (overrideScale) {
+			canvasProps.scale = containerWidth / (canvasWidth + paddingX * 2);
+		}
+		if (persist) {
+			localStorage.setItem("studioCanvasZoom", canvasProps.scale.toString())
+		}
 
 		canvasProps.translateX = 0;
 		canvasProps.translateY = 0;
diff --git a/frontend/src/utils/useStudioEvents.ts b/frontend/src/utils/useStudioEvents.ts
index eb7a8ab0..c3b2fb9c 100644
--- a/frontend/src/utils/useStudioEvents.ts
+++ b/frontend/src/utils/useStudioEvents.ts
@@ -141,6 +141,30 @@ export function useStudioEvents() {
 			store.mode = "select"
 			return
 		}
+
+		if (e.key === "=" && isCtrlOrCmd(e)) {
+			e.preventDefault()
+			if (canvasStore.activeCanvas?.zoomIn) {
+				canvasStore.activeCanvas.zoomIn()
+			}
+			return
+		}
+
+		if (e.key === "-" && isCtrlOrCmd(e)) {
+			e.preventDefault()
+			if (canvasStore.activeCanvas?.zoomOut) {
+				canvasStore.activeCanvas.zoomOut()
+			}
+			return
+		}
+
+		if (e.key === "0" && isCtrlOrCmd(e)) {
+			e.preventDefault()
+			if (canvasStore.activeCanvas?.setScaleAndTranslate) {
+				canvasStore.activeCanvas.setScaleAndTranslate()
+			}
+			return
+		}
 	})
 }