From d9083fa2edd76f1109ed3a2dea771991d274ae45 Mon Sep 17 00:00:00 2001
From: Laurent Cozic <laurent@cozic.net>
Date: Wed, 2 Aug 2017 17:55:03 +0000
Subject: [PATCH] Fixed layout bug

---
 .../lib/components/screens/notes.js           | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/ReactNativeClient/lib/components/screens/notes.js b/ReactNativeClient/lib/components/screens/notes.js
index 1e0bf24708..b345305168 100644
--- a/ReactNativeClient/lib/components/screens/notes.js
+++ b/ReactNativeClient/lib/components/screens/notes.js
@@ -121,18 +121,6 @@ class NotesScreenComponent extends BaseScreenComponent {
 
 	render() {
 		const parent = this.parentItem();
-
-		if (!parent) {
-			return (
-				<View style={this.styles().screen}>
-					<ScreenHeader title={title} menuOptions={this.menuOptions()} />
-				</View>
-			)
-		}
-
-		let title = parent ? parent.title : null;
-		const addFolderNoteButtons = this.props.selectedFolderId && this.props.selectedFolderId != Folder.conflictFolderId();
-
 		const theme = themeStyle(this.props.theme);
 
 		let rootStyle = {
@@ -144,6 +132,17 @@ class NotesScreenComponent extends BaseScreenComponent {
 			rootStyle.flex = 0.001; // This is a bit of a hack but it seems to work fine - it makes the component invisible but without unmounting it
 		}
 
+		if (!parent) {
+			return (
+				<View style={rootStyle}>
+					<ScreenHeader title={title} menuOptions={this.menuOptions()} />
+				</View>
+			)
+		}
+
+		let title = parent ? parent.title : null;
+		const addFolderNoteButtons = this.props.selectedFolderId && this.props.selectedFolderId != Folder.conflictFolderId();
+
 		return (
 			<View style={rootStyle}>
 				<ScreenHeader title={title} menuOptions={this.menuOptions()} />