diff --git a/src/screens/Notes/Notes.tsx b/src/screens/Notes/Notes.tsx
index 6c8c14f2..ef652a7c 100644
--- a/src/screens/Notes/Notes.tsx
+++ b/src/screens/Notes/Notes.tsx
@@ -34,7 +34,13 @@ import { StyledIcon } from './Notes.styled';
 import { notePassesFilter, NoteSortKey } from './utils';
 
 export const Notes = React.memo(
-  ({ shouldSplitLayout }: { shouldSplitLayout: boolean | undefined }) => {
+  ({
+    shouldSplitLayout,
+    keyboardHeight,
+  }: {
+    shouldSplitLayout: boolean | undefined;
+    keyboardHeight: number | undefined;
+  }) => {
     // Context
     const application = useContext(ApplicationContext);
     const theme = useContext(ThemeContext);
@@ -477,7 +483,7 @@ export const Notes = React.memo(
           // @ts-ignore style prop does not exist in types
           style={
             application?.getAppState().isInTabletMode
-              ? { bottom: application?.getAppState().getKeyboardHeight() }
+              ? { bottom: keyboardHeight }
               : undefined
           }
           buttonColor={theme.stylekitInfoColor}
diff --git a/src/screens/Root.tsx b/src/screens/Root.tsx
index 008e0f02..abc7f66a 100644
--- a/src/screens/Root.tsx
+++ b/src/screens/Root.tsx
@@ -136,7 +136,10 @@ export const Root = (): JSX.Element | null => {
         notesListCollapsed={noteListCollapsed}
         shouldSplitLayout={shouldSplitLayout}
       >
-        <Notes shouldSplitLayout={shouldSplitLayout} />
+        <Notes
+          keyboardHeight={keyboardHeight}
+          shouldSplitLayout={shouldSplitLayout}
+        />
       </NotesContainer>
       {hasEditor && shouldSplitLayout && (
         <ComposeContainer>