diff --git a/CHANGELOG b/CHANGELOG
index b07ace6b5e0cdb0d97c3b05fa40d5876780ebdef..563aa1a22f9ff6754818bc1836edef7040a71bc0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,5 @@
 minerva (12.1.4) stable; urgency=medium
+  * Bug fix: upload of data overlay from admin panel didn't work
   * Bug fix: there are no more extra markers due to map wrapping
   * Bug fix: upload of the project failed when another project was removed 
     during upload 
diff --git a/frontend-js/src/main/js/gui/admin/EditProjectDialog.js b/frontend-js/src/main/js/gui/admin/EditProjectDialog.js
index 4226657fa683668e4563b726f5e2f10ac3c1abba..4d46be2614a1b88117bf0238cea5afd0db97ecd6 100644
--- a/frontend-js/src/main/js/gui/admin/EditProjectDialog.js
+++ b/frontend-js/src/main/js/gui/admin/EditProjectDialog.js
@@ -1033,7 +1033,7 @@ EditProjectDialog.prototype.removeOverlay = function (overlayId) {
 
 /**
  *
- * @returns {Promise}
+ * @returns {Promise<AddOverlayDialog>}
  */
 EditProjectDialog.prototype.openAddOverlayDialog = function () {
   var self = this;
@@ -1044,13 +1044,16 @@ EditProjectDialog.prototype.openAddOverlayDialog = function () {
     project: self.getProject(),
     customMap: null,
     element: document.createElement("div"),
-    configuration: self.getConfiguration()
+    configuration: self.getConfiguration(),
+    serverConnector: self.getServerConnector()
   });
   self._addOverlayDialog.addListener("onAddOverlay", function () {
     return self.refreshOverlays();
   });
   return self._addOverlayDialog.init().then(function () {
     return self._addOverlayDialog.open();
+  }).then(function(){
+    return self._addOverlayDialog;
   });
 };
 
diff --git a/frontend-js/src/test/js/gui/admin/EditProjectDialog-test.js b/frontend-js/src/test/js/gui/admin/EditProjectDialog-test.js
index 63ef99e9513628718a7957cf422bce667d0f61a2..dea7260b7d201fd3ebcef2e0059102f7b77e77f3 100644
--- a/frontend-js/src/test/js/gui/admin/EditProjectDialog-test.js
+++ b/frontend-js/src/test/js/gui/admin/EditProjectDialog-test.js
@@ -122,8 +122,11 @@ describe('EditProjectDialog', function () {
     return createDialog().then(function (result) {
       dialog = result;
       return dialog.openAddOverlayDialog();
+    }).then(function (overlayDialog) {
+      overlayDialog.setFileContent("X");
+      return $("button:contains('UPLOAD')").click();
     }).then(function () {
-      dialog.destroy();
+      return dialog.destroy();
     });
   });