diff --git a/app/views/dmsf_links/_form.html.erb b/app/views/dmsf_links/_form.html.erb
index 20fedaaa..9f3e3427 100644
--- a/app/views/dmsf_links/_form.html.erb
+++ b/app/views/dmsf_links/_form.html.erb
@@ -39,9 +39,9 @@
       <% unless @fast_links && (@type == 'link_to') %>
         <p>
           <% if @type == 'link_from' %>
-            <label for="dmsf_link[target_project_id]"><%= l(:label_source_project) %></label>
+            <label for="dmsf_link_target_project_id"><%= l(:label_source_project) %></label>
           <% else %>
-            <label for="dmsf_link[target_project_id]"><%= l(:label_target_project) %></label>
+            <label for="dmsf_link_target_project_id"><%= l(:label_target_project) %></label>
           <% end %>
           <%= select_tag 'dmsf_link[target_project_id]',
             project_tree_options_for_select(DmsfFile.allowed_target_projects_on_copy,
diff --git a/app/views/dmsf_links/autocomplete_for_folder.js.erb b/app/views/dmsf_links/autocomplete_for_folder.js.erb
index c898cb84..7ed5bf25 100644
--- a/app/views/dmsf_links/autocomplete_for_folder.js.erb
+++ b/app/views/dmsf_links/autocomplete_for_folder.js.erb
@@ -18,7 +18,6 @@
   # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 %>
 
-$('#dmsf_link_target_file_id').html('<%= escape_javascript(
-  select_tag('dmsf_link[target_file_id]',
+$('#dmsf_link_target_file_id').empty().append('<%= escape_javascript(
             options_for_select(DmsfFolder.file_list(files_for_select(params[:dmsf_link][:target_project_id],
-            params[:dmsf_link][:target_folder_id]))))) %>');
+            params[:dmsf_link][:target_folder_id])))) %>');
diff --git a/app/views/dmsf_links/autocomplete_for_project.js.erb b/app/views/dmsf_links/autocomplete_for_project.js.erb
index ef63f64c..cd163e60 100644
--- a/app/views/dmsf_links/autocomplete_for_project.js.erb
+++ b/app/views/dmsf_links/autocomplete_for_project.js.erb
@@ -20,7 +20,6 @@
 
 var link = $('#dmsf_link_target_folder_id');
 
-link.html('<%= escape_javascript(
-  select_tag('dmsf_link[target_folder_id]',
-         folder_tree_options_for_select(DmsfFolder.directory_tree(params[:dmsf_link][:target_project_id])))) %>');
+link.empty().append('<%= escape_javascript(
+         folder_tree_options_for_select(DmsfFolder.directory_tree(params[:dmsf_link][:target_project_id]))) %>');
 link.change();