diff --git a/src/components/applications/media-viewer/MediaViewer.jsx b/src/components/applications/media-viewer/MediaViewer.jsx
index a37f6b0..bc60629 100644
--- a/src/components/applications/media-viewer/MediaViewer.jsx
+++ b/src/components/applications/media-viewer/MediaViewer.jsx
@@ -1,5 +1,6 @@
 // eslint-disable-next-line no-unused-vars
 import { VirtualFile } from "../../../features/virtual-drive/virtual-file.js"
+import { useWindowsManager } from "../../../hooks/windows/WindowsManagerContext.js";
 import styles from "./MediaViewer.module.css";
 
 /**
@@ -8,9 +9,16 @@ import styles from "./MediaViewer.module.css";
  * @param {VirtualFile} props.file
  * @returns 
  */
-export function MediaViewer({ file }) {
-	if (file == null)
-		return (<p>Use the File Explorer to open an image.</p>);
+export function MediaViewer({ file, close }) {
+	const windowsManager = useWindowsManager();
+
+	if (file == null) {
+		setTimeout(() => {
+			windowsManager.open("file-explorer", { startPath: "~/Images" });
+			close();
+		}, 10);
+		return;
+	}
 
 	if (!["png"].includes(file.extension))
 		return (<p>Invalid file format.</p>);
diff --git a/src/components/task-bar/HomeMenu.jsx b/src/components/task-bar/HomeMenu.jsx
index 9099372..afcea73 100644
--- a/src/components/task-bar/HomeMenu.jsx
+++ b/src/components/task-bar/HomeMenu.jsx
@@ -55,8 +55,8 @@ export function HomeMenu({ active, setActive }) {
 					</button>
 					<button title="Images" onClick={() => {
 						setActive(false);
-						windowsManager.open("file-explorer", { startPath: "~/Images" }); }
-					}>
+						windowsManager.open("file-explorer", { startPath: "~/Images" });
+					}}>
 						<FontAwesomeIcon icon={faImage}/>
 					</button>
 					<button title="Documents" onClick={() => {
diff --git a/src/components/windows/Window.jsx b/src/components/windows/Window.jsx
index 66da0e5..5912743 100644
--- a/src/components/windows/Window.jsx
+++ b/src/components/windows/Window.jsx
@@ -76,7 +76,10 @@ export function Window({ id, app, size, position, focused = false, onInteract, o
 					width: maximized ? null : size.x,
 					height: maximized ? null : size.y,
 				}}
-				onClick={onInteract}
+				onClick={(event) => {
+					if (!event.defaultPrevented)
+						onInteract(event);
+				}}
 			>
 				<div className={`${styles.Header} Handle`}>
 					<ReactSVG className={styles["Window-icon"]} src={process.env.PUBLIC_URL + `/media/applications/icons/${app.id}.svg`}/>
diff --git a/src/features/windows/windows.js b/src/features/windows/windows.js
index 1438821..7a67e5c 100644
--- a/src/features/windows/windows.js
+++ b/src/features/windows/windows.js
@@ -10,6 +10,11 @@ export default class WindowsManager {
 		this.updateWindows = () => {};
 	}
 
+	/**
+	 * @param {String} appId 
+	 * @param {Object|null} options 
+	 * @returns {Object}
+	 */
 	open(appId, options) {
 		const app = ApplicationsManager.getApplication(appId);
 		const size = new Vector2(700, 400);
@@ -34,18 +39,23 @@ export default class WindowsManager {
 		};
 
 		this.updateWindows(this.windows);
+		return this.windows[id];
 		// console.log(this);
 	}
 
 	/**
 	 * @param {VirtualFile} file 
+	 * @returns {Object}
 	 */
 	openFile(file) {
 		const app = ApplicationsManager.getFileApplication(file.extension);
 		if (app != null)
-			this.open(app.id, { file });
+			return this.open(app.id, { file });
 	}
 
+	/**
+	 * @param {String} windowId 
+	 */
 	close(windowId) {
 		windowId = windowId.toString();
 
@@ -61,11 +71,18 @@ export default class WindowsManager {
 		// console.log(this);
 	}
 
+	/**
+	 * @param {Object} window 
+	 */
 	focus(window) {
 		window.lastInteraction = new Date().valueOf();
 		this.updateWindows(this.windows);
 	}
 
+	/**
+	 * @param {String} appId 
+	 * @returns {Boolean}
+	 */
 	isAppActive(appId) {
 		let active = false;
 
@@ -79,6 +96,9 @@ export default class WindowsManager {
 		return active;
 	}
 
+	/**
+	 * @param {Function} updateWindows 
+	 */
 	setUpdateWindows(updateWindows) {
 		this.updateWindows = updateWindows;
 	}