diff --git a/tools/server/public/index.html.gz b/tools/server/public/index.html.gz
index c5b9166a30..e59d8a2470 100644
Binary files a/tools/server/public/index.html.gz and b/tools/server/public/index.html.gz differ
diff --git a/tools/server/webui/src/lib/components/app/misc/KeyboardShortcutInfo.svelte b/tools/server/webui/src/lib/components/app/misc/KeyboardShortcutInfo.svelte
index 5b7522fe1b..bffbf7945f 100644
--- a/tools/server/webui/src/lib/components/app/misc/KeyboardShortcutInfo.svelte
+++ b/tools/server/webui/src/lib/components/app/misc/KeyboardShortcutInfo.svelte
@@ -17,9 +17,11 @@
 <kbd class="{baseClasses} {variantClasses} {className}">
 	{#each keys as key, index (index)}
 		{#if key === 'shift'}
-			<ArrowBigUp class="h-1 w-1 {variant === 'destructive' ? 'text-destructive' : ''} -mr-1" />
+			<ArrowBigUp class="size-4 {variant === 'destructive' ? 'text-destructive' : ''} -mr-1" />
 		{:else if key === 'cmd'}
 			<span class={variant === 'destructive' ? 'text-destructive' : ''}>⌘</span>
+		{:else if key === 'ctrl'}
+			<span class={variant === 'destructive' ? 'text-destructive' : ''}>Ctrl</span>
 		{:else}
 			{key.toUpperCase()}
 		{/if}
diff --git a/tools/server/webui/src/lib/components/app/notebook/NotebookScreen.svelte b/tools/server/webui/src/lib/components/app/notebook/NotebookScreen.svelte
index 932172e58a..4b0b32d9f2 100644
--- a/tools/server/webui/src/lib/components/app/notebook/NotebookScreen.svelte
+++ b/tools/server/webui/src/lib/components/app/notebook/NotebookScreen.svelte
@@ -5,7 +5,7 @@
 	import { Play, Square, Settings, Undo, Redo } from '@lucide/svelte';
 	import { config } from '$lib/stores/settings.svelte';
 	import DialogChatSettings from '$lib/components/app/dialogs/DialogChatSettings.svelte';
-	import { ModelsSelector, ChatMessageStatistics, DialogChatError } from '$lib/components/app';
+	import { ChatMessageStatistics, DialogChatError, KeyboardShortcutInfo, ModelsSelector } from '$lib/components/app';
 	import { useModelChangeValidation } from '$lib/hooks/use-model-change-validation.svelte';
 	import { modelsStore, modelOptions, selectedModelId } from '$lib/stores/models.svelte';
 	import { isRouterMode } from '$lib/stores/server.svelte';
@@ -203,9 +203,36 @@
 			event.returnValue = '';
 		}
 	}
+
+	function handleKeydown(event: KeyboardEvent) {
+		const isCtrlOrCmd = event.ctrlKey || event.metaKey;
+
+		if (event.shiftKey && event.key === 'Enter') {
+			event.preventDefault();
+			if (notebookStore.isGenerating) {
+				handleStop();
+			} else if (canGenerate) {
+				handleGenerate();
+			}
+		}
+
+		if (isCtrlOrCmd && event.key === 'z') {
+			event.preventDefault();
+			if (canUndo) {
+				handleUndo();
+			}
+		}
+
+		if (isCtrlOrCmd && event.key === 'y') {
+			event.preventDefault();
+			if (canRedo) {
+				handleRedo();
+			}
+		}
+	}
 </script>
 
-<svelte:window onbeforeunload={handleBeforeUnload} />
+<svelte:window onbeforeunload={handleBeforeUnload} onkeydown={handleKeydown} />
 
 <div class="flex h-full flex-col">
 	<header
@@ -219,7 +246,7 @@
 		</Button>
 	</header>
 
-	<div class="flex-1 overflow-y-auto p-2 md:p-4">
+	<div class="flex-1 overflow-y-auto pb-0 pt-2 md:pt-4 px-2 md:px-4">
 		<Textarea
 			bind:ref={scrollContainer}
 			onscroll={handleScroll}
@@ -246,6 +273,7 @@
 					</Tooltip.Trigger>
 					<Tooltip.Content>
 						<p>Undo last generation</p>
+						<KeyboardShortcutInfo keys={['ctrl', 'z']} class="opacity-100 w-full justify-center" />
 					</Tooltip.Content>
 				</Tooltip.Root>
 
@@ -262,6 +290,7 @@
 					</Tooltip.Trigger>
 					<Tooltip.Content>
 						<p>Redo last generation</p>
+						<KeyboardShortcutInfo keys={['ctrl', 'y']} class="opacity-100 w-full justify-center" />
 					</Tooltip.Content>
 				</Tooltip.Root>
 
@@ -283,19 +312,19 @@
 					</Button>
 				{/snippet}
 
-				{#if generateTooltip}
-					<Tooltip.Root>
-						<Tooltip.Trigger>
-							{@render generateButton()}
-						</Tooltip.Trigger>
+				<Tooltip.Root>
+					<Tooltip.Trigger>
+						{@render generateButton()}
+					</Tooltip.Trigger>
 
-						<Tooltip.Content>
+					<Tooltip.Content>
+						{#if generateTooltip}
 							<p>{generateTooltip}</p>
-						</Tooltip.Content>
-					</Tooltip.Root>
-				{:else}
-					{@render generateButton()}
-				{/if}
+						{:else}
+							<KeyboardShortcutInfo keys={['shift', 'enter']} class="opacity-100 w-full justify-center" />
+						{/if}
+					</Tooltip.Content>
+				</Tooltip.Root>
 
 				<ModelsSelector
 					currentModel={notebookModel}