diff --git a/Riot/Modules/GlobalSearch/UnifiedSearchViewController.m b/Riot/Modules/GlobalSearch/UnifiedSearchViewController.m
index 5713ca837..90c003ffa 100644
--- a/Riot/Modules/GlobalSearch/UnifiedSearchViewController.m
+++ b/Riot/Modules/GlobalSearch/UnifiedSearchViewController.m
@@ -153,6 +153,18 @@
     [self updateSearch];
 }
 
+- (void)viewWillDisappear:(BOOL)animated
+{
+    if (!self.searchBarHidden && self.extendedLayoutIncludesOpaqueBars)
+    {
+        //  if a search bar is visible, navigationBar height will be increased. Below code will force update layout on previous view controller.
+        [self.navigationController.view setNeedsLayout]; // force update layout
+        [self.navigationController.view layoutIfNeeded]; // to fix height of the navigation bar
+    }
+
+    [super viewWillDisappear:animated];
+}
+
 - (void)viewDidAppear:(BOOL)animated
 {
     [super viewDidAppear:animated];