diff --git a/Owncloud iOs Client/Utils/UtilsTableView.m b/Owncloud iOs Client/Utils/UtilsTableView.m
index 93ea699e56..2174b8c562 100644
--- a/Owncloud iOs Client/Utils/UtilsTableView.m	
+++ b/Owncloud iOs Client/Utils/UtilsTableView.m	
@@ -37,7 +37,7 @@ + (CGFloat) getUITableViewHeightForSingleRowByNavigationBatHeight:(CGFloat) navi
     CGFloat tableViewHeight = 0.0;
     if (!IS_IPHONE) {
         
-        if (IS_IOS7) {
+        if (IS_IOS7 || IS_IOS8) {
             
             if (IS_PORTRAIT) {
                 tableViewHeight = k_tableViewHeight_portrait;
@@ -56,9 +56,17 @@ + (CGFloat) getUITableViewHeightForSingleRowByNavigationBatHeight:(CGFloat) navi
         }
     } else {
         tableViewHeight = tableViewHeightForIphone;
+        
         if (IS_IOS7) {
-            height = tableViewHeight - tabBarControllerHeight - navigationBarHeight - k_status_bar_height;
-        } else {
+            height = tableViewHeight- tabBarControllerHeight - navigationBarHeight - k_status_bar_height;
+        }else if (IS_IOS8){
+            
+            if (IS_PORTRAIT) {
+                 height = tableViewHeight- tabBarControllerHeight - navigationBarHeight - k_status_bar_height;
+            }else{
+                height = tableViewHeight- tabBarControllerHeight - navigationBarHeight;
+            }
+        }else{
             height = tableViewHeight;
         }
     }