2 files changed, 10 insertions, 6 deletions
diff --git a/web/sass-files/sass/partials/_base.scss b/web/sass-files/sass/partials/_base.scss
index 5808aeb44..4fb918bd1 100644
--- a/web/sass-files/sass/partials/_base.scss
+++ b/web/sass-files/sass/partials/_base.scss
@@ -11,17 +11,21 @@ body {
   &.white {
     background: #fff;
     .inner__wrap {
-      height: 100%;
+      > .row.content {
+        min-height: 100%;
+        margin-bottom: -89px;
+      }
     }
-    .row.content {
-      min-height: 100%;
-      height: auto !important;
+  }
+  .inner__wrap {
+    height: 100%;
+    > .row.main {
       height: 100%;
-      margin-bottom: -89px;
     }
   }
   > .container-fluid {
     @include clearfix;
+    height: 100%;
     position: relative;
   }
 }
diff --git a/web/sass-files/sass/partials/_mentions.scss b/web/sass-files/sass/partials/_mentions.scss
index ee254b546..d6e2ab368 100644
--- a/web/sass-files/sass/partials/_mentions.scss
+++ b/web/sass-files/sass/partials/_mentions.scss
@@ -9,7 +9,7 @@
 
 .mentions--top {
 	position: absolute;
-    z-index: 1040;
+	z-index: 1060;
 	.mentions-box {
 		position:absolute;
 		background-color:#fff;