diff --git a/domain-server/resources/web/content/js/content.js b/domain-server/resources/web/content/js/content.js
index 525b989259..4d8034eb1d 100644
--- a/domain-server/resources/web/content/js/content.js
+++ b/domain-server/resources/web/content/js/content.js
@@ -54,7 +54,7 @@ $(document).ready(function(){
         var fileFormData = new FormData();
         fileFormData.append('restore-file', files[0]);
 
-        showSpinnerAlert("Restoring Content");
+        showSpinnerAlert("Uploading content to restore");
 
         $.ajax({
           url: '/content/upload',
@@ -65,7 +65,6 @@ $(document).ready(function(){
           data: fileFormData
         }).done(function(data, textStatus, jqXHR) {
           swal.close();
-          showRestartModal();
         }).fail(function(jqXHR, textStatus, errorThrown) {
           showErrorMessage(
             "Error",
diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index a332810e54..e40adb5059 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -2247,7 +2247,7 @@ bool DomainServer::handleHTTPRequest(HTTPConnection* connection, const QUrl& url
                 // check the file extension to see what kind of file this is
                 // to make sure we handle this filetype for a content restore
                 auto dispositionValue = QString(firstFormData.first.value("Content-Disposition"));
-                auto formDataFilenameRegex = QRegExp("filename=\"(\\S+)\"");
+                auto formDataFilenameRegex = QRegExp("filename=\"(.+)\"");
                 auto matchIndex = formDataFilenameRegex.indexIn(dispositionValue);
 
                 QString uploadedFilename = "";