diff --git a/frontend-js/src/main/js/gui/admin/EditProjectDialog.js b/frontend-js/src/main/js/gui/admin/EditProjectDialog.js
index 06c5afaae85beb9f0b85b223fec08956bb1018a2..89d61d1db500186fd22e2641e9ef374b632be41c 100644
--- a/frontend-js/src/main/js/gui/admin/EditProjectDialog.js
+++ b/frontend-js/src/main/js/gui/admin/EditProjectDialog.js
@@ -19,6 +19,7 @@ function EditProjectDialog(params) {
   AbstractGuiElement.call(this, params);
   var self = this;
   $(self.getElement()).addClass("minerva-edit-project-dialog");
+  $(self.getElement()).css({overflow: "hidden"});
 
   self.createGui();
 }
@@ -33,7 +34,8 @@ EditProjectDialog.prototype.createGui = function () {
   var tabDiv = Functions.createElement({
     type: "div",
     name: "tabView",
-    className: "tabbable boxed parentTabs"
+    className: "tabbable boxed parentTabs",
+    style: "position:absolute;top:10px;bottom:40px;left:10px;right:10px"
   });
   element.appendChild(tabDiv);
 
@@ -45,7 +47,8 @@ EditProjectDialog.prototype.createGui = function () {
 
   var tabContentDiv = Functions.createElement({
     type: "div",
-    className: "tab-content"
+    className: "tab-content",
+    style: "height:100%"
   });
   tabDiv.appendChild(tabContentDiv);
 
@@ -53,6 +56,11 @@ EditProjectDialog.prototype.createGui = function () {
   self.createOverlaysTab(tabMenuDiv, tabContentDiv);
   self.createMapsTab(tabMenuDiv, tabContentDiv);
   self.createUsersTab(tabMenuDiv, tabContentDiv);
+  $("a", tabMenuDiv).bind("click", function () {
+    //workaround for some css issues...
+    tabDiv.style.top = "40px";
+    tabDiv.style.bottom = "10px";
+  });
 };
 
 EditProjectDialog.prototype.createGeneralTab = function (tabMenuDiv, tabContentDiv) {
@@ -80,6 +88,7 @@ EditProjectDialog.prototype.addTab = function (params) {
     navigationObject: navLi,
     navigationBar: params.tabMenuDiv
   });
+  contentDiv.style.overflow = "auto";
 
   if (params.content !== undefined) {
     contentDiv.appendChild(params.content);
diff --git a/frontend-js/src/main/js/gui/admin/EditUserDialog.js b/frontend-js/src/main/js/gui/admin/EditUserDialog.js
index 248aa190f0698e82eee05e42e4ec09adbfd34c3f..e4a51806b4541e2c63661dd69cf055b9023c37fc 100644
--- a/frontend-js/src/main/js/gui/admin/EditUserDialog.js
+++ b/frontend-js/src/main/js/gui/admin/EditUserDialog.js
@@ -18,6 +18,8 @@ function EditUserDialog(params) {
   var self = this;
   self.setUser(params.user);
 
+  $(self.getElement()).css({overflow: "hidden"});
+
   self.createGui();
   self.registerListenerType("onSave");
 }
@@ -47,7 +49,8 @@ EditUserDialog.prototype.createGui = function () {
   var tabDiv = Functions.createElement({
     type: "div",
     name: "tabView",
-    className: "tabbable boxed parentTabs"
+    className: "tabbable boxed parentTabs",
+    style: "position:absolute;top:10px;bottom:40px;left:10px;right:10px"
   });
   element.appendChild(tabDiv);
 
@@ -59,13 +62,19 @@ EditUserDialog.prototype.createGui = function () {
 
   var tabContentDiv = Functions.createElement({
     type: "div",
-    className: "tab-content"
+    className: "tab-content",
+    style: "height:100%"
   });
   tabDiv.appendChild(tabContentDiv);
 
   self.createGeneralTab(tabMenuDiv, tabContentDiv);
   self.createPrivilegesTab(tabMenuDiv, tabContentDiv);
   self.createProjectsTab(tabMenuDiv, tabContentDiv);
+  $("a", tabMenuDiv).bind("click", function () {
+    //workaround for some css issues...
+    tabDiv.style.top = "40px";
+    tabDiv.style.bottom = "10px";
+  });
 };
 
 EditUserDialog.prototype.createGeneralTab = function (tabMenuDiv, tabContentDiv) {
@@ -117,6 +126,8 @@ EditUserDialog.prototype.addTab = function (params) {
     navigationBar: params.tabMenuDiv
   });
 
+  contentDiv.style.overflow = "auto";
+  
   if (params.content !== undefined) {
     contentDiv.appendChild(params.content);
   }