diff --git a/modules/es/styles/es.ContextView.css b/modules/es/styles/es.ContextView.css
index b801a2da07..d35c3cdab8 100644
--- a/modules/es/styles/es.ContextView.css
+++ b/modules/es/styles/es.ContextView.css
@@ -51,7 +51,7 @@
 }
 
 .es-contextView-position-below .es-menuView {
-	top: 3px;
+	top: 2px;
 }
 
 .es-contextView-panels {
diff --git a/modules/es/views/es.ContextView.js b/modules/es/views/es.ContextView.js
index e806559cbb..a2f19b5306 100644
--- a/modules/es/views/es.ContextView.js
+++ b/modules/es/views/es.ContextView.js
@@ -105,7 +105,7 @@ es.ContextView.prototype.set = function() {
 		}
 		$menu.css( 'left', menuLeft );
 		// Position menu on top or bottom depending on viewport
-		if ( position.top + menuHeight < windowHeight + windowScrollTop ) {
+		if ( position.top + menuHeight + ( menuMargin * 2 ) < windowHeight + windowScrollTop ) {
 			this.$.addClass( 'es-contextView-position-below' );
 		} else {
 			this.$.addClass( 'es-contextView-position-above' );