diff --git a/api/js/etemplate/et2_widget_vfs.js b/api/js/etemplate/et2_widget_vfs.js
index f8be45b284..53ca5b1baf 100644
--- a/api/js/etemplate/et2_widget_vfs.js
+++ b/api/js/etemplate/et2_widget_vfs.js
@@ -83,6 +83,11 @@ var et2_vfs = (function(){ "use strict"; return et2_valueWidget.extend([et2_IDet
 		}
 		else
 		{
+			if(_value.path.indexOf(_value.name) >= 0)
+			{
+				// Remove name from end, so we can add it again later
+				path = sub_path;
+			}
 			var path_offset = 0;
 			var path_parts = [_value.name];
 		}