diff --git a/app/views/isa_studies/_form.html.erb b/app/views/isa_studies/_form.html.erb
index 92d47194a5..3d90c7aabf 100644
--- a/app/views/isa_studies/_form.html.erb
+++ b/app/views/isa_studies/_form.html.erb
@@ -34,9 +34,6 @@
 
     <%= render :partial=> "assets/discussion_links_form", :locals=>{:resource => @isa_study.study} -%>
 
-    <%= render partial: 'projects/implicit_project_selector', locals: { action: action,
-                                                                          select_id: '#study_investigation_id',
-                                                                          parents: Investigation.authorized_for('edit') } %>
 
     <%= folding_panel("Define #{t(:sample_type)} for Source") do %>
       <%= render partial: 'sample_types_form', locals: {f: f, sample_type: @isa_study.source, id_suffix: "_source_sample_type", action: action } if @isa_study.source %>
@@ -55,11 +52,14 @@
 
 <% end -%>
 
+<%= form_submit_buttons(@isa_study.study) %>
 
+<%= render partial: 'projects/implicit_project_selector', locals: { action: action,
+                                                                    select_id: '#isa_study_study_investigation_id',
+                                                                    parents: Investigation.authorized_for('edit'),
+                                                                    skip_on_page_load: true} %>
 
 
-<%= form_submit_buttons(@isa_study.study) %>
-
 <script>
     const templates = <%= load_templates().to_json.html_safe %>
     const initTemplateModal = function(field_name) {
diff --git a/app/views/studies/_buttons.html.erb b/app/views/studies/_buttons.html.erb
index 8af4b1e38a..aa3d3dea3f 100644
--- a/app/views/studies/_buttons.html.erb
+++ b/app/views/studies/_buttons.html.erb
@@ -20,9 +20,7 @@
 
 <% if item.can_edit? -%>
   <% if Seek::Config.isa_json_compliance_enabled && item.is_isa_json_compliant? %>
-    <% if item&.sample_types.present? %>
-      <%= button_link_to("Design #{t('assays.assay_stream')}", 'new', new_isa_assay_path(study_id: item.id, single_page: params[:single_page], is_assay_stream: true)) %>
-    <% end -%>
+    <%= button_link_to("Design #{t('assays.assay_stream')}", 'new', new_isa_assay_path(study_id: item.id, single_page: params[:single_page], is_assay_stream: true)) %>
   <% else -%>
     <%= add_new_item_to_dropdown(item) %>
   <% end -%>