diff --git a/nodes.py b/nodes.py
index 630392f6d..f4fac8d90 100644
--- a/nodes.py
+++ b/nodes.py
@@ -973,7 +973,7 @@ class LoadImage:
         input_dir = folder_paths.get_input_directory()
         input_dir = [f for f in os.listdir(input_dir) if os.path.isfile(os.path.join(input_dir, f))]
         return {"required":
-                    {"image": (sorted(input_dir), )},
+                    {"image": ("FILE_COMBO", {"base_dir": "input", "files": sorted(input_dir)}, )},
                 }
 
     CATEGORY = "image"
@@ -1013,9 +1013,10 @@ class LoadImageMask:
     @classmethod
     def INPUT_TYPES(s):
         input_dir = folder_paths.get_input_directory()
+        input_dir = [f for f in os.listdir(input_dir) if os.path.isfile(os.path.join(input_dir, f))]
         return {"required":
-                    {"image": (sorted(os.listdir(input_dir)), ),
-                    "channel": (s._color_channels, ),}
+                    {"image": ("FILE_COMBO", {"base_dir": "input", "files": sorted(input_dir)}, ),
+                     "channel": (s._color_channels, ), }
                 }
 
     CATEGORY = "mask"
diff --git a/server.py b/server.py
index be08aea60..48644d83a 100644
--- a/server.py
+++ b/server.py
@@ -201,6 +201,14 @@ class PromptServer():
                 filename = request.rel_url.query["filename"]
                 filename,output_dir = folder_paths.annotated_filepath(filename)
 
+                if request.rel_url.query.get("type", "input") and filename.startswith("clipspace/"):
+                    output_dir = folder_paths.get_clipspace_directory()
+                    filename = filename[10:]
+
+                # validation for security: prevent accessing arbitrary path
+                if filename[0] == '/' or '..' in filename:
+                    return web.Response(status=400)
+
                 if output_dir is None:
                     type = request.rel_url.query.get("type", "output")
                     output_dir = folder_paths.get_directory_by_type(type)
diff --git a/web/scripts/app.js b/web/scripts/app.js
index 75118a02f..45744a4a4 100644
--- a/web/scripts/app.js
+++ b/web/scripts/app.js
@@ -231,6 +231,11 @@ export class ComfyApp {
 									if(this.widgets) {
 										const index = this.widgets.findIndex(obj => obj.name === 'image');
 										if(index >= 0 && filename != "") {
+											const postfix = ' [clipspace]';
+											if(filename.endsWith(postfix) && this.widgets[index].options.base_dir == 'input') {
+												filename = "clipspace/" + filename.slice(0, filename.indexOf(postfix));
+											}
+
 											this.widgets[index].value = filename;
 											if(this.widgets_values != undefined) {
 												this.widgets_values[index] = filename;
diff --git a/web/scripts/widgets.js b/web/scripts/widgets.js
index c0e73ffa1..905bf9fa5 100644
--- a/web/scripts/widgets.js
+++ b/web/scripts/widgets.js
@@ -256,6 +256,20 @@ export const ComfyWidgets = {
 		}
 		return { widget: node.addWidget("combo", inputName, defaultValue, () => {}, { values: type }) };
 	},
+	FILE_COMBO(node, inputName, inputData) {
+		const base_dir = inputData[1].base_dir;
+		let defaultValue = inputData[1].files[0];
+
+		const files = []
+		for(let i in inputData[1].files) {
+			files[i] = inputData[1].files[i];
+			const postfix = ' [clipspace]';
+			if(base_dir == 'input' && files[i].endsWith(postfix))
+				files[i] = "clipspace/" + files[i].slice(0, files[i].indexOf(postfix));
+		}
+
+		return { widget: node.addWidget("combo", inputName, defaultValue, () => {}, { base_dir:base_dir, values: files }) };
+	},
 	IMAGEUPLOAD(node, inputName, inputData, app) {
 		const imageWidget = node.widgets.find((w) => w.name === "image");
 		let uploadWidget;