diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt
index 6a4bf8b9..e4e971e9 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt
@@ -90,7 +90,7 @@ class MainActivity : SimpleActivity() {
         setupOptionsMenu()
         refreshMenuItems()
 
-        updateMaterialActivityViews(main_coordinator, main_linear_layout)
+        updateMaterialActivityViews(main_coordinator, null)
 
         searchQueryET = findViewById(R.id.search_query)
         searchPrevBtn = findViewById(R.id.search_previous)
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/ChecklistFragment.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/ChecklistFragment.kt
index 889969b0..2ad53b39 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/ChecklistFragment.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/ChecklistFragment.kt
@@ -4,6 +4,8 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.RelativeLayout
+import androidx.coordinatorlayout.widget.CoordinatorLayout
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
 import com.simplemobiletools.commons.extensions.*
@@ -114,8 +116,12 @@ class ChecklistFragment : NoteFragment(), ChecklistItemsListener {
                 showNewItemDialog()
                 (view.checklist_list.adapter as? ChecklistAdapter)?.finishActMode()
             }
+
+            (layoutParams as CoordinatorLayout.LayoutParams).bottomMargin = (resources.getDimension(R.dimen.activity_margin) + context.navigationBarHeight).toInt()
         }
 
+        view.checklist_list.setPadding(0, 0, 0, (resources.getDimension(R.dimen.secondary_fab_bottom_margin) + requireContext().navigationBarHeight).toInt())
+
         view.fragment_placeholder.setTextColor(requireActivity().getProperTextColor())
         view.fragment_placeholder_2.apply {
             setTextColor(adjustedPrimaryColor)
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/TextFragment.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/TextFragment.kt
index 509d7eb9..c2f46c89 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/TextFragment.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/TextFragment.kt
@@ -15,6 +15,7 @@ import android.view.ViewGroup
 import android.view.inputmethod.EditorInfo
 import android.view.inputmethod.InputMethodManager
 import com.simplemobiletools.commons.extensions.*
+import com.simplemobiletools.commons.helpers.mydebug
 import com.simplemobiletools.notes.pro.R
 import com.simplemobiletools.notes.pro.activities.MainActivity
 import com.simplemobiletools.notes.pro.extensions.config
@@ -163,6 +164,10 @@ class TextFragment : NoteFragment() {
 
         checkLockState()
         setTextWatcher()
+
+        view.text_note_view.apply {
+            setPadding(paddingLeft, paddingTop, paddingRight, (context.resources.getDimension(R.dimen.activity_margin) + context.navigationBarHeight).toInt())
+        }
     }
 
     fun setTextWatcher() {
diff --git a/app/src/main/res/layout/fragment_text.xml b/app/src/main/res/layout/fragment_text.xml
index 3344a618..208f8464 100644
--- a/app/src/main/res/layout/fragment_text.xml
+++ b/app/src/main/res/layout/fragment_text.xml
@@ -54,9 +54,8 @@
         <RelativeLayout
             android:id="@+id/notes_relative_layout"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content" />
 
-        </RelativeLayout>
     </ScrollView>
 
     <com.simplemobiletools.commons.views.MyTextView