diff --git a/apps/mocksi-lite/background.ts b/apps/mocksi-lite/background.ts
index d813f000..9989921e 100644
--- a/apps/mocksi-lite/background.ts
+++ b/apps/mocksi-lite/background.ts
@@ -18,6 +18,7 @@ export interface Recording {
 	dom_before: string;
 	tab_id: string;
 	uuid: string;
+  url: string;
 }
 
 interface ChromeMessage {
@@ -138,6 +139,7 @@ function createDemo(body: Record<string, unknown>) {
 			...body,
 			...defaultBody,
 			tab_id: result.id?.toString() ?? "",
+      url: result.url
 		}).then(() => getRecordings());
 	});
 }
diff --git a/apps/mocksi-lite/content/Popup/CreateDemo/DemoItem.tsx b/apps/mocksi-lite/content/Popup/CreateDemo/DemoItem.tsx
index 07358cd9..ac4f82dd 100644
--- a/apps/mocksi-lite/content/Popup/CreateDemo/DemoItem.tsx
+++ b/apps/mocksi-lite/content/Popup/CreateDemo/DemoItem.tsx
@@ -17,6 +17,7 @@ const DemoItem = ({
 	customer_name,
 	setState,
 	alterations,
+  url
 }: DemoItemProps) => {
 	const handleEdit = () => {
 		setEditorMode(true, uuid);
@@ -30,12 +31,13 @@ const DemoItem = ({
 				<TextField>{customer_name}</TextField>
 			</div>
 			<div className={"flex gap-3"}>
-				<Button variant={Variant.icon} onClick={handleEdit}>
+				<Button variant={Variant.icon} onClick={handleEdit} disabled={!url.includes(window.location.hostname)}>
 					<img src={editIcon} alt={"editIcon"} />
 				</Button>
 				<Button
 					variant={Variant.icon}
 					onClick={() => loadAlterations(alterations)}
+          disabled={!url.includes(window.location.hostname)}
 				>
 					<img src={exportIcon} alt={"exportIcon"} />
 				</Button>
diff --git a/apps/mocksi-lite/content/Popup/CreateDemo/Form.tsx b/apps/mocksi-lite/content/Popup/CreateDemo/Form.tsx
index 13aaad21..c66d3cb6 100644
--- a/apps/mocksi-lite/content/Popup/CreateDemo/Form.tsx
+++ b/apps/mocksi-lite/content/Popup/CreateDemo/Form.tsx
@@ -49,7 +49,7 @@ const Form = ({ onCancel }: FormProps) => {
 						/>
 					</div>
 					<div className={"mt-[42px] flex justify-end gap-4"}>
-						<Button onClick={onCancel} variant={Variant.secondary}>
+						<Button onClick={() => onCancel()} variant={Variant.secondary}>
 							Cancel
 						</Button>
 						<Button disabled={!name.length} onClick={handleSubmit}>