diff --git a/common/templates/upload.html b/common/templates/upload.html
index 33c7b0326..8d4991e56 100644
--- a/common/templates/upload.html
+++ b/common/templates/upload.html
@@ -5,7 +5,7 @@
                 <div class="form-group" style="margin-bottom: 0px;">
                     <input name="{{::column.name}}" type="file" accept="{{fileExtensions}}" tabindex="-1" id="{{fileElId}}" style="position: absolute; clip: rect(0px 0px 0px 0px);" ng-disabled="isDisabled">
                     <div class="input-group input-group-sm" style="width: 100%;">
-                        <input name="txt{{::column.name}}" type="text" class="form-control" ng-required="isRequired" ng-disabled="isDisabled" placeholder="{{placeholder}}" readonly="" ng-model="value.url" ng-click="select()" ng-style="column.getInputDisabled($root.context.appContext) ? {'cursor': 'default'} : {'cursor': 'pointer'}" style="padding-right: 25px;font-size: 14px; height: 34px; pointer-events: all;"/>
+                        <input name="txt{{::column.name}}" type="text" class="form-control" ng-required="isRequired" ng-disabled="isDisabled" placeholder="{{placeholder}}" readonly="" ng-model="setFilename" ng-model-options="{getterSetter: true}" ng-click="select()" tooltip-placement="bottom-left" uib-tooltip="{{setFilename()}}" ng-style="column.getInputDisabled($root.context.appContext) ? {'cursor': 'default'} : {'cursor': 'pointer'}" style="padding-right: 25px;font-size: 14px; height: 34px; pointer-events: all;"/>
                         <div class="form-control-feedback coltooltip" ng-click="clear()" ng-hide="!value.url || value.url == '' || isDisabled" style="cursor: pointer;right: 105px;top: 2px;pointer-events: all; height: 34px;">
                             <span class="glyphicon glyphicon-remove coltooltiptext foreignkey-remove" tooltip-placement="bottom" uib-tooltip="Clear field"></span>
                         </div>
diff --git a/common/upload.js b/common/upload.js
index 638e8e528..f6b88419b 100644
--- a/common/upload.js
+++ b/common/upload.js
@@ -57,7 +57,7 @@
                                         column: scope.column,
                                         reference: scope.reference
                                     });
-                                    scope.value.url = scope.value.file.name;
+                                    scope.value.url = scope.value.filename = scope.value.file.name;
                                     scope.$apply();
                                 }
                             });
@@ -74,10 +74,22 @@
 
                     scope.clear = function() {
                         scope.value.url = "";
+                        scope.value.filename = "";
                         delete scope.value.file;
                         delete scope.value.hatracObj;
                         scope.fileEl.val("");
                     };
+
+                    scope.setFilename = function () {
+                        var value = scope.value;
+                        if (value) {
+                            if (value.filename) {
+                                return value.filename;
+                            } else {
+                                return value.url;
+                            }
+                        }
+                    }
                 }
             };
         }])
diff --git a/recordedit/recordEdit.app.js b/recordedit/recordEdit.app.js
index c2fae7664..66ebd2612 100644
--- a/recordedit/recordEdit.app.js
+++ b/recordedit/recordEdit.app.js
@@ -327,7 +327,10 @@
                                         default:
                                             // the structure for asset type columns is an object with a 'url' property
                                             if (column.isAsset && colModel.inputType !== "disabled") {
-                                                value = { url: values[i] || "" };
+                                                value = {
+                                                    url: values[i] || "",
+                                                    filename: tuple.data[column._filenameColumn.name]
+                                                };
                                             } else {
                                                 value = values[i];
                                             }