diff --git a/interface/resources/qml/AssetServer.qml b/interface/resources/qml/AssetServer.qml
index 1220f288f7..0490db2fa7 100644
--- a/interface/resources/qml/AssetServer.qml
+++ b/interface/resources/qml/AssetServer.qml
@@ -212,7 +212,13 @@ Window {
         });
     }
 
+    property var uploadOpen: false;
     function uploadClicked() {
+        if(uploadOpen) {
+            return;
+        }
+        uploadOpen = true;
+
         var fileUrl = fileUrlTextField.text
         var addToWorld = addToWorldCheckBox.checked
 
@@ -230,6 +236,7 @@ Window {
 
             reload();
         });
+        uploadOpen = false;
     }
 
     function errorMessageBox(message) {
diff --git a/interface/src/scripting/AssetMappingsScriptingInterface.cpp b/interface/src/scripting/AssetMappingsScriptingInterface.cpp
index ea763210c9..9934b7937c 100644
--- a/interface/src/scripting/AssetMappingsScriptingInterface.cpp
+++ b/interface/src/scripting/AssetMappingsScriptingInterface.cpp
@@ -83,6 +83,7 @@ void AssetMappingsScriptingInterface::getMapping(QString path, QJSValue callback
 void AssetMappingsScriptingInterface::uploadFile(QString path, QString mapping, QJSValue callback) {
     auto offscreenUi = DependencyManager::get<OffscreenUi>();
     auto result = offscreenUi->inputDialog(OffscreenUi::ICON_NONE, "Enter asset path:", "", mapping);
+
     if (!result.isValid()) {
         return;
     }