diff --git a/javascript/ThumbnailStripField.js b/javascript/ThumbnailStripField.js
index e8ea7554..fd222356 100755
--- a/javascript/ThumbnailStripField.js
+++ b/javascript/ThumbnailStripField.js
@@ -34,9 +34,11 @@ ThumbnailStripField.prototype = {
 					
 					timeout = setTimeout(function() {
 						var searchText = searchField.value;
-						
-						$('Flash').ajaxGetFiles(null, searchText);
-						$('FolderImages').ajaxGetFiles(null, searchText);
+						var folderID = null;
+						if (parentField && parentField.inputTag) 
+							folderID = parentField.inputTag.value
+						$('Flash').ajaxGetFiles(folderID, searchText);
+						$('FolderImages').ajaxGetFiles(folderID, searchText);
 					}, 500);
 				});
 			}