diff --git a/core/css/styles.scss b/core/css/styles.scss
index fd5702787a..541c0d4a85 100644
--- a/core/css/styles.scss
+++ b/core/css/styles.scss
@@ -778,6 +778,7 @@ code {
 		.menu {
 			top:100%;
 			margin:10px;
+			margin-left: 0px;
 			form {
 				display:flex;
 				margin:10px;
diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js
index dcdb339c37..0ef371cd75 100644
--- a/core/js/oc-dialogs.js
+++ b/core/js/oc-dialogs.js
@@ -307,7 +307,7 @@ var OCdialogs = {
 					}
 				} catch (error) {
 					$input.attr('title', error);
-					$input.tooltip({placement: 'right', trigger: 'manual', 'container': '.newFileMenu'});
+					$input.tooltip({placement: 'right', trigger: 'manual', 'container': '.newFolderMenu'});
 					$input.tooltip('fixTitle');
 					$input.tooltip('show');
 					$input.addClass('error');
diff --git a/core/templates/filepicker.html b/core/templates/filepicker.html
index d764ff377d..b88c8f308d 100644
--- a/core/templates/filepicker.html
+++ b/core/templates/filepicker.html
@@ -1,7 +1,7 @@
 <div id="{dialog_name}" title="{title}">
 	<span class="dirtree breadcrumb"></span>
 	<span class="actions creatable"><a href="#" class="icon icon-add button button-add"></a>
-	<nav class="menu popovermenu bubble menu-center newFileMenu">
+	<nav class="menu popovermenu bubble menu-left newFolderMenu">
 		<ul><li>
 		<form class="filenameform">
 			<input type="text" value={newtext}>