diff --git a/app/views/dmsf/edit.html.erb b/app/views/dmsf/edit.html.erb
index fbc70a9a..171896ca 100644
--- a/app/views/dmsf/edit.html.erb
+++ b/app/views/dmsf/edit.html.erb
@@ -27,8 +27,9 @@
 				<p>
 					<%= label_tag("", l(:field_folder) + ":") %>
 					<%= f.select(:dmsf_folder_id, 
-						options_for_select(DmsfFolder.directory_tree(@project, @folder), 
-							:selected => @folder.nil? ? (@pathfolder.id unless @pathfolder.nil?) : (@folder.folder.id unless @folder.folder.nil?))) %>
+						options_for_select(DmsfFolder.directory_tree(@project, @folder), 	
+                                                  :selected => @parent? @parent.id : (@pathfolder.id if @pathfolder)))                                                  
+					%>				
 				</p>
 			</div>
 		</div>