diff --git a/src/components/textarea.svelte b/src/components/textarea.svelte
index ac8e49c..be991a1 100644
--- a/src/components/textarea.svelte
+++ b/src/components/textarea.svelte
@@ -9,22 +9,22 @@
 	import { cacheShortforms, expandShortform } from '../modules/shortforms';
 	import { defaultExpanders } from '../modules/keyboard';
 	import { db, type Shortform } from '../db/main';
-	  import { liveQuery } from "dexie";
+	import { liveQuery } from 'dexie';
 
-	import * as Select from "$lib/components/ui/select/index.js";
+	import * as Select from '$lib/components/ui/select/index.js';
 
 	let styles = $derived({
-		"text-bg": "#333333",
-		"text-fg": "#baff00",
-		"text-font": textSettings.font,
-		"text-size": textSettings.size + "px"
-		})
+		'text-bg': '#333333',
+		'text-fg': '#baff00',
+		'text-font': textSettings.font,
+		'text-size': textSettings.size + 'px'
+	});
 
-	let selectedStandardList = {}
+	let selectedStandardList = {};
 	const selectedStandardListChanged = (v) => {
-		shortforms.standardList = v.value
+		shortforms.standardList = v.value;
 		shortforms.cache = cacheShortforms([Number(v.value)]);
-	}
+	};
 	let state = {
 		capitalizeNext: true,
 		currentWord: ''
@@ -33,7 +33,7 @@
 	let textarea: HTMLTextAreaElement;
 
 	onMount(() => {
-		initShortformState()
+		initShortformState();
 		shortforms.cache = cacheShortforms([890324]);
 		if (browser) {
 			let t = document.getElementById('doc') as HTMLTextAreaElement;
@@ -44,20 +44,24 @@
 				}, 25);
 			}
 		}
-
 	});
 
-	const standardLists = $derived(liveQuery( async () => { 
-		return await db.lists.toArray()
-	}))
+	const standardLists = $derived(
+		liveQuery(async () => {
+			return await db.lists.toArray();
+		})
+	);
 	let css = Object.entries(styles)
-			.map(([key, value]) => `--${key}:${value}`)
-			.join(';')
-	const cssVarStyles = $derived({css})
+		.map(([key, value]) => `--${key}:${value}`)
+		.join(';');
+	const cssVarStyles = $derived({ css });
 
 	const expand = (e: InputEvent) => {
-		const expander = e.data as string;
+		let expander = e.data as string;
 		// console.log("expander:", expander);
+		if (e.inputType == 'insertLineBreak') {
+			expander = '\n';
+		}
 		if (defaultExpanders.has(expander)) {
 			const expanderRules = defaultExpanders.get(expander)!;
 			const currentWord = getCurrentWord(textarea).trim();
@@ -67,7 +71,9 @@
 				state.capitalizeNext = true;
 			}
 			if (expandedPhrase != '') {
-				insertExpandedPhrase(textarea, expander, currentWord.length, expandedPhrase);
+				const pos = insertExpandedPhrase(textarea, expander, currentWord.length, expandedPhrase);
+				textarea.blur();
+				textarea.focus();
 				e.preventDefault();
 			}
 		}
@@ -84,20 +90,21 @@
 		if (e.inputType == 'insertText') {
 			const key = e.data || '';
 			if (e.data == null) return;
-			if (state.capitalizeNext) {
+			if (key != ' ' && state.capitalizeNext) {
 				insertText(textarea, key.toUpperCase());
 				state.capitalizeNext = false;
 				e.preventDefault();
 			}
 			expand(e);
 		}
-		if (e.inputType == 'insertText') {
+		if (e.inputType == 'insertLineBreak') {
+			expand(e);
 		}
 	};
 </script>
 
-<div class="docContainer h-full flex flex-col" role="application" id="docContainer">
-	<textarea 
+<div class="docContainer flex h-full flex-col" role="application" id="docContainer">
+	<textarea
 		bind:this={ref}
 		style="
 			font-size:{textSettings.size}px;
@@ -105,10 +112,10 @@
 			color:{textSettings.colors.fg};
 			background-color:{textSettings.colors.bg};
 		"
-		class="textarea h-full flex-grow" 
-		id="doc" 
-		on:keyup={change} 
-		on:beforeinput={input} 
+		class="textarea h-full flex-grow"
+		id="doc"
+		on:keyup={change}
+		on:beforeinput={input}
 		bind:value={appState.text}
 		spellcheck="false"
 	></textarea>
@@ -124,11 +131,11 @@
 		padding: 0.3em;
 		resize: none;
 	}
-	
+
 	.textarea {
 		color: var(--text-fg, black);
 		background-color: var(--text-bg, white);
-		font-family: var(--text-font, "Arial");
-		font-size: var(--text-size, "20px");
+		font-family: var(--text-font, 'Arial');
+		font-size: var(--text-size, '20px');
 	}
 </style>
diff --git a/src/lib/textarea/main.ts b/src/lib/textarea/main.ts
index 0437830..f57570c 100644
--- a/src/lib/textarea/main.ts
+++ b/src/lib/textarea/main.ts
@@ -4,10 +4,11 @@ export const insertText = (textarea: HTMLTextAreaElement, text: string) => {
   textarea.setRangeText(text, start, end, "end");
 };
 
-export const insertExpandedPhrase = (textarea: HTMLTextAreaElement, expander: string, len: number, text: string) => {
+export const insertExpandedPhrase = (textarea: HTMLTextAreaElement, expander: string, len: number, text: string): number => {
   const start = textarea.selectionStart - len;
   const end = textarea.selectionStart;
   textarea.setRangeText(text.concat(expander), start, end, "end");
+  return end
 };
 
 const findIndexOfCurrentWord = (textarea: HTMLTextAreaElement) => {
diff --git a/src/modules/keyboard.ts b/src/modules/keyboard.ts
index 273dfd7..84824ad 100644
--- a/src/modules/keyboard.ts
+++ b/src/modules/keyboard.ts
@@ -8,6 +8,11 @@ let fullscreen = true;
 export const defaultExpanders: Map<string, ExpanderType> = new Map();
 export const hotkeys: Map<string, any> = new Map();
 
+defaultExpanders.set("\n", {
+	key: { keyCode: 13, shiftKey: false },
+	symbol: "\n",
+	fullstop: true,
+});
 defaultExpanders.set(" ", {
 	key: { keyCode: 190, shiftKey: false },
 	symbol: " ",
@@ -139,13 +144,13 @@ hotkeys.set("F11", {
 	action: (e) => {
 		console.log("Toggle fullscreen")
 		console.log(PUBLIC_TAURI)
-		if(PUBLIC_TAURI == true) {
+		if (PUBLIC_TAURI == true) {
 			e.preventDefault()
 			if (fullscreen) {
 				getCurrentWindow().setFullscreen(false).then(() => {
 					fullscreen = false
 
-				
+
 				});
 			} else {
 				getCurrentWindow().setFullscreen(true).then(() => {