diff --git a/app/assets/javascripts/repositories/forms/repository_item_edit.js b/app/assets/javascripts/repositories/forms/repository_item_edit.js
index 91696ba55..e82d48815 100644
--- a/app/assets/javascripts/repositories/forms/repository_item_edit.js
+++ b/app/assets/javascripts/repositories/forms/repository_item_edit.js
@@ -24,10 +24,10 @@
    * @returns {undefinded}
    */
   RepositoryItemEditForm.prototype.renderForm = function(table) {
-    var colIndex     = getColumnIndex(table, '#row-name');
-    var cells        = this.itemData.repository_row.repository_cells;
+    var colIndex    = getColumnIndex(table, '#row-name');
+    var cells       = this.itemData.repository_row.repository_cells;
     var listColumns = this.itemData.repository_row.repository_column_items;
-    var formData     = this.formData;
+    var formData    = this.formData;
 
     if (colIndex) {
       $(this.repositoryItemElement).children('td').eq(colIndex)
@@ -194,7 +194,7 @@
       "' data-id='" + id + "'>" + buttonLabel +
       "</button></div><div><p class='file-name-label'>" + fileName +
       "</p></div>";
-    if(fileName.length > 0) {
+    if(value.file_file_name) {
       html += "<div><a data-action='removeAsset' ";
       html += "onClick='clearFileInput(this)'><i class='fas fa-times'></i></a>";
     } else {
diff --git a/app/assets/javascripts/repositories/repository_datatable.js.erb b/app/assets/javascripts/repositories/repository_datatable.js.erb
index 4f0399f2a..23372c335 100644
--- a/app/assets/javascripts/repositories/repository_datatable.js.erb
+++ b/app/assets/javascripts/repositories/repository_datatable.js.erb
@@ -1070,13 +1070,13 @@ var RepositoryDatatable = (function(global) {
 
   // Takes object and surrounds it with input
   function changeToInputFileField(object, name, value) {
-    return "<div class='repository-input-file-field new-input-file-field-div'>"+
-        "<div class='form-group'>" +
+    return "<div class='repository-input-file-field'>"+
+        "<div class='new-input-file-field-div'><div class='form-group'>" +
         "<input type='file' class='form-control' data-object='" +
         object + "' name='" + name + "' value='" + value + "'></div>" +
         "<a onClick='clearFileInput(this)'>" +
         "<i class='fas fa-times'></i>" +
-        "</a></div>";
+        "</a></div></div>";
   }
 
   global.clearFileInput = function (el) {
diff --git a/app/assets/stylesheets/themes/repositories.scss b/app/assets/stylesheets/themes/repositories.scss
index 85221bdac..1cc68f1de 100644
--- a/app/assets/stylesheets/themes/repositories.scss
+++ b/app/assets/stylesheets/themes/repositories.scss
@@ -40,6 +40,7 @@
 }
 
 .repository-input-file-field {
+  width: auto;
   .form-group {
     align-items: baseline;
     border: 1px solid $color-alto;