diff --git a/e107_admin/image.php b/e107_admin/image.php
index b9fea517a..570ae6943 100644
--- a/e107_admin/image.php
+++ b/e107_admin/image.php
@@ -573,7 +573,7 @@ class media_form_ui extends e_admin_form_ui
 		// File Picker. 
 		if($_GET['action'] == 'dialog')
 		{		
-			$text = "<input type='button' value='Select' data-placement='left' class='e-media-select e-dialog-save e-dialog-close btn btn-primary btn-large' data-id='{$id}' data-name=\"".$title."\" data-target='{$tagid}' data-bbcode='{$bbcode}' data-path='{$path}' data-preview='{$preview}' title=\"".$title."\"  />";
+			$text = "<input type='button' value='Select' data-placement='left' class='e-media-select e-dialog-save e-dialog-close btn btn-primary btn-large' data-id='{$id}' data-name=\"".$title."\" data-type='file' data-target='{$tagid}' data-bbcode='{$bbcode}' data-path='{$path}' data-preview='{$preview}' title=\"".$title."\"  />";
 		}
 
 		$text .= $this->renderValue('options',$value,'',$id);
diff --git a/e107_web/js/core/mediaManager.js b/e107_web/js/core/mediaManager.js
index 0878b09fc..ceff30329 100644
--- a/e107_web/js/core/mediaManager.js
+++ b/e107_web/js/core/mediaManager.js
@@ -130,6 +130,8 @@ $(document).ready(function()
 		$(".e-media-select").live("click", function(){
   	 		
     		//	console.log(this);
+    		
+    		// alert('hi');
 
 				var id			= $(this).attr('data-id');
 				var target 		= $(this).attr('data-target');
@@ -170,7 +172,7 @@ $(document).ready(function()
 					//alert(bbpath);		
 				}
 				
-				
+
 
 
 				$('#src').attr('value',src); // working old
@@ -195,7 +197,11 @@ $(document).ready(function()
 					$('#html_holder').val(preview);
 					$('#path').attr('value',path);		
 				}	
-				else
+				else if(type == 'file')
+				{
+					preview = name;	
+				}
+				else // image
 				{
 					eMediaAttribute(this);	
 					preview = $('#html_holder').val();