diff --git a/src/lib/components/chat/MessageInput.svelte b/src/lib/components/chat/MessageInput.svelte
index a71578513d..f0d51aa9a1 100644
--- a/src/lib/components/chat/MessageInput.svelte
+++ b/src/lib/components/chat/MessageInput.svelte
@@ -280,7 +280,7 @@
 			<div class="w-full relative">
 				{#if atSelectedModel !== undefined}
 					<div
-						class="px-3 py-2.5 text-left w-full flex justify-between items-center absolute bottom-0 left-0 right-0 bg-gradient-to-t from-50% from-white dark:from-gray-900 z-10"
+						class="px-3 py-2.5 text-left w-full flex justify-between items-center absolute bottom-0.5 left-0 right-0 bg-gradient-to-t from-50% from-white dark:from-gray-900 z-10"
 					>
 						<div class="flex items-center gap-2 text-sm dark:text-gray-500">
 							<img
diff --git a/src/lib/components/chat/MessageInput/Commands/Documents.svelte b/src/lib/components/chat/MessageInput/Commands/Documents.svelte
index 04275be4eb..147544534b 100644
--- a/src/lib/components/chat/MessageInput/Commands/Documents.svelte
+++ b/src/lib/components/chat/MessageInput/Commands/Documents.svelte
@@ -2,7 +2,7 @@
 	import { createEventDispatcher } from 'svelte';
 
 	import { documents } from '$lib/stores';
-	import { removeFirstHashWord, isValidHttpUrl } from '$lib/utils';
+	import { removeLastWordFromString, isValidHttpUrl } from '$lib/utils';
 	import { tick, getContext } from 'svelte';
 	import { toast } from 'svelte-sonner';
 
@@ -79,7 +79,7 @@
 	const confirmSelect = async (doc) => {
 		dispatch('select', doc);
 
-		prompt = removeFirstHashWord(prompt);
+		prompt = removeLastWordFromString(prompt, command);
 		const chatInputElement = document.getElementById('chat-textarea');
 
 		await tick();
@@ -90,7 +90,7 @@
 	const confirmSelectWeb = async (url) => {
 		dispatch('url', url);
 
-		prompt = removeFirstHashWord(prompt);
+		prompt = removeLastWordFromString(prompt, command);
 		const chatInputElement = document.getElementById('chat-textarea');
 
 		await tick();
@@ -101,7 +101,7 @@
 	const confirmSelectYoutube = async (url) => {
 		dispatch('youtube', url);
 
-		prompt = removeFirstHashWord(prompt);
+		prompt = removeLastWordFromString(prompt, command);
 		const chatInputElement = document.getElementById('chat-textarea');
 
 		await tick();
diff --git a/src/lib/utils/index.ts b/src/lib/utils/index.ts
index 56922f03fd..995712dfa3 100644
--- a/src/lib/utils/index.ts
+++ b/src/lib/utils/index.ts
@@ -297,7 +297,10 @@ export const removeLastWordFromString = (inputString, wordString) => {
 	}
 
 	// Join the remaining words back into a string
-	const resultString = words.join(' ');
+	let resultString = words.join(' ');
+	if (resultString !== '') {
+		resultString += ' ';
+	}
 
 	return resultString;
 };