diff --git a/app/assets/javascripts/results/result_assets.js b/app/assets/javascripts/results/result_assets.js
index ab0b6bcbd..34a166a50 100644
--- a/app/assets/javascripts/results/result_assets.js
+++ b/app/assets/javascripts/results/result_assets.js
@@ -2,6 +2,20 @@
   'use strict';
 
   global.ResultAssets = (function() {
+    // New asset callback
+    function createResultAssetCallback() {
+      $('.new-result-assets-buttons')
+        .on('click', '.save-result', (event) => {
+          DragNDropResults.processResult(event); // eslint-disable-line no-undef
+        })
+        .on('click', '.cancel-new', () => {
+          DragNDropResults.destroyAll(); // eslint-disable-line no-undef
+        });
+
+      $('#new-result-assets-select').on('change', '#drag-n-drop-assets', function() {
+        DragNDropResults.init(this.files); // eslint-disable-line no-undef
+      });
+    }
     // New result asset behaviour
     function initNewResultAsset() {
       $('#new-result-asset').on('click', function(event) {
@@ -24,6 +38,7 @@
             Results.initCancelFormButton($form, initNewResultAsset);
             Results.toggleResultEditButtons(false);
             dragNdropAssetsInit();
+            createResultAssetCallback();
           },
           error: function(xhr, status, e) {
             $(this).renderFormErrors('result', xhr.responseJSON, true, e);
@@ -34,6 +49,13 @@
       });
     }
 
+    // Save asset callback
+    function saveResultAssetCallback() {
+      $('.edit-result-assets-buttons').on('click', '.save-result', (event) => {
+        Results.processResult(event, Results.ResultTypeEnum.FILE); // eslint-disable-line no-undef
+      });
+    }
+
     function applyEditResultAssetCallback() {
       $('.edit-result-asset').off('ajax:success ajax:error').on('ajax:success', function(e, data) {
         var $result = $(this).closest('.result');
@@ -55,6 +77,7 @@
         Results.toggleResultEditButtons(false);
 
         $('#result_name').focus();
+        saveResultAssetCallback();
       }).on('ajax:error', function(e, xhr, status, error) {
         animateSpinner(null, false);
       });
diff --git a/app/assets/javascripts/results/result_assets/edit.js b/app/assets/javascripts/results/result_assets/edit.js
deleted file mode 100644
index 81d85d51e..000000000
--- a/app/assets/javascripts/results/result_assets/edit.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/* global Results */
-
-(function() {
-  $('.edit-result-assets-buttons').on('click', '.save-result', (event) => {
-    Results.processResult(event, Results.ResultTypeEnum.FILE);
-  });
-}());
diff --git a/app/assets/javascripts/results/result_assets/new.js b/app/assets/javascripts/results/result_assets/new.js
deleted file mode 100644
index 7a1141703..000000000
--- a/app/assets/javascripts/results/result_assets/new.js
+++ /dev/null
@@ -1,15 +0,0 @@
-/* global DragNDropResults */
-
-(function() {
-  $('.new-result-assets-buttons')
-    .on('click', '.save-result', (event) => {
-      DragNDropResults.processResult(event);
-    })
-    .on('click', '.cancel-new', () => {
-      DragNDropResults.destroyAll();
-    });
-
-  $('#new-result-assets-select').on('change', '#drag-n-drop-assets', function() {
-    DragNDropResults.init(this.files);
-  });
-}());
diff --git a/app/views/result_assets/_edit.html.erb b/app/views/result_assets/_edit.html.erb
index 0a9bf89da..b5106dea5 100644
--- a/app/views/result_assets/_edit.html.erb
+++ b/app/views/result_assets/_edit.html.erb
@@ -18,5 +18,4 @@
                    class: 'btn btn-primary save-result' %>
     </div>
   <% end %>
-  <%= javascript_include_tag 'results/result_assets/edit', nonce: true %>
 </div>
diff --git a/app/views/result_assets/_new.html.erb b/app/views/result_assets/_new.html.erb
index 3d56c0f63..5a41a1ee4 100644
--- a/app/views/result_assets/_new.html.erb
+++ b/app/views/result_assets/_new.html.erb
@@ -27,5 +27,4 @@
 
     </div>
   <% end %>
-  <%= javascript_include_tag 'results/result_assets/new', nonce: true %>
 </div>
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
index ca86a9040..e84c501a0 100644
--- a/config/initializers/assets.rb
+++ b/config/initializers/assets.rb
@@ -108,8 +108,6 @@ Rails.application.config.assets.precompile += %w(users/registrations/new_with_pr
 Rails.application.config.assets.precompile += %w(team_zip_exports/load_handson.js)
 Rails.application.config.assets.precompile += %w(repository_columns/manage_column_partials/number.js)
 Rails.application.config.assets.precompile += %w(repository_columns/manage_column_partials/stock.js)
-Rails.application.config.assets.precompile += %w(results/result_assets/new.js)
-Rails.application.config.assets.precompile += %w(results/result_assets/edit.js)
 Rails.application.config.assets.precompile += %w(results/result_tables/new.js)
 Rails.application.config.assets.precompile += %w(results/result_tables/edit.js)
 Rails.application.config.assets.precompile += %w(results/result_texts/new.js)