diff --git a/CHANGELOG b/CHANGELOG
index bd6c2cbf1..7f1675f0b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 KeePassDX(3.4.4)
  * Fix crash in New Android 13 #1321
  * Better backstack management for selection mode
+ * Prevent Tapjacking #1318
 
 KeePassDX(3.4.3)
  * Remove "Select share info" setting for Magikeyboard #1304
diff --git a/app/src/main/res/layout-v23/view_advanced_unlock.xml b/app/src/main/res/layout-v23/view_advanced_unlock.xml
index 28cbc84fb..5d9fb8f0e 100644
--- a/app/src/main/res/layout-v23/view_advanced_unlock.xml
+++ b/app/src/main/res/layout-v23/view_advanced_unlock.xml
@@ -23,7 +23,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/fingerprint_container"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    android:filterTouchesWhenObscured="true">
 
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/biometric_image"
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
index 04869f9af..f77b7ae71 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -21,6 +21,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:filterTouchesWhenObscured="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical">
 
diff --git a/app/src/main/res/layout/activity_entry.xml b/app/src/main/res/layout/activity_entry.xml
index 4f502da86..96c2b2937 100644
--- a/app/src/main/res/layout/activity_entry.xml
+++ b/app/src/main/res/layout/activity_entry.xml
@@ -24,6 +24,7 @@
     android:id="@+id/toolbar_coordinator"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:filterTouchesWhenObscured="true"
     android:fitsSystemWindows="true">
 
     <com.google.android.material.appbar.AppBarLayout
diff --git a/app/src/main/res/layout/activity_entry_edit.xml b/app/src/main/res/layout/activity_entry_edit.xml
index b04f0b6b3..67ba1771c 100644
--- a/app/src/main/res/layout/activity_entry_edit.xml
+++ b/app/src/main/res/layout/activity_entry_edit.xml
@@ -24,7 +24,8 @@
     android:importantForAutofill="noExcludeDescendants"
     tools:targetApi="o"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:filterTouchesWhenObscured="true">
 
     <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:id="@+id/entry_edit_coordinator_layout"
diff --git a/app/src/main/res/layout/activity_file_selection.xml b/app/src/main/res/layout/activity_file_selection.xml
index cbe367c1a..f1d42d78f 100644
--- a/app/src/main/res/layout/activity_file_selection.xml
+++ b/app/src/main/res/layout/activity_file_selection.xml
@@ -23,6 +23,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:filterTouchesWhenObscured="true"
     android:importantForAutofill="noExcludeDescendants"
     tools:targetApi="o">
 
diff --git a/app/src/main/res/layout/activity_group.xml b/app/src/main/res/layout/activity_group.xml
index 00b603600..cdeed30e1 100644
--- a/app/src/main/res/layout/activity_group.xml
+++ b/app/src/main/res/layout/activity_group.xml
@@ -24,6 +24,7 @@
     android:id="@+id/drawer_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:filterTouchesWhenObscured="true"
     android:fitsSystemWindows="true">
 
     <RelativeLayout
diff --git a/app/src/main/res/layout/activity_icon_picker.xml b/app/src/main/res/layout/activity_icon_picker.xml
index 0c0714be4..fee7d16f7 100644
--- a/app/src/main/res/layout/activity_icon_picker.xml
+++ b/app/src/main/res/layout/activity_icon_picker.xml
@@ -22,6 +22,7 @@
     android:id="@+id/icon_picker_container"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:filterTouchesWhenObscured="true"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <androidx.coordinatorlayout.widget.CoordinatorLayout
diff --git a/app/src/main/res/layout/activity_image_viewer.xml b/app/src/main/res/layout/activity_image_viewer.xml
index 2133ebd27..a600a7c0a 100644
--- a/app/src/main/res/layout/activity_image_viewer.xml
+++ b/app/src/main/res/layout/activity_image_viewer.xml
@@ -4,6 +4,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:filterTouchesWhenObscured="true"
     android:id="@+id/image_viewer_container"
     android:background="?android:attr/windowBackground">
     <include
diff --git a/app/src/main/res/layout/activity_key_generator.xml b/app/src/main/res/layout/activity_key_generator.xml
index 1e2a2e327..30f598dab 100644
--- a/app/src/main/res/layout/activity_key_generator.xml
+++ b/app/src/main/res/layout/activity_key_generator.xml
@@ -22,6 +22,7 @@
     android:id="@+id/key_generator_container"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:filterTouchesWhenObscured="true"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <androidx.coordinatorlayout.widget.CoordinatorLayout
diff --git a/app/src/main/res/layout/activity_main_credential.xml b/app/src/main/res/layout/activity_main_credential.xml
index 2ad279e9c..84ae78ce4 100644
--- a/app/src/main/res/layout/activity_main_credential.xml
+++ b/app/src/main/res/layout/activity_main_credential.xml
@@ -23,6 +23,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:filterTouchesWhenObscured="true"
     android:background="?android:attr/windowBackground"
     tools:targetApi="o">
 
diff --git a/app/src/main/res/layout/activity_toolbar.xml b/app/src/main/res/layout/activity_toolbar.xml
index be4dd28bd..fff49771c 100644
--- a/app/src/main/res/layout/activity_toolbar.xml
+++ b/app/src/main/res/layout/activity_toolbar.xml
@@ -22,6 +22,7 @@
     android:id="@+id/toolbar_coordinator"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:filterTouchesWhenObscured="true"
     android:background="?android:attr/windowBackground"
     android:fitsSystemWindows="true">
 
diff --git a/app/src/main/res/layout/view_advanced_unlock.xml b/app/src/main/res/layout/view_advanced_unlock.xml
index 8f2913127..29a623e01 100644
--- a/app/src/main/res/layout/view_advanced_unlock.xml
+++ b/app/src/main/res/layout/view_advanced_unlock.xml
@@ -22,4 +22,5 @@
     android:id="@+id/fingerprint_container"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:filterTouchesWhenObscured="true"
     tools:visibility="gone" />
diff --git a/app/src/main/res/layout/view_button_add_node.xml b/app/src/main/res/layout/view_button_add_node.xml
index 14e67c3f9..5edb6a1ab 100644
--- a/app/src/main/res/layout/view_button_add_node.xml
+++ b/app/src/main/res/layout/view_button_add_node.xml
@@ -21,6 +21,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:filterTouchesWhenObscured="true"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <LinearLayout
diff --git a/app/src/main/res/layout/view_button_lock.xml b/app/src/main/res/layout/view_button_lock.xml
index 8fa14dfe7..346798ba0 100644
--- a/app/src/main/res/layout/view_button_lock.xml
+++ b/app/src/main/res/layout/view_button_lock.xml
@@ -2,7 +2,8 @@
 <FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    android:filterTouchesWhenObscured="true">
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/lock_button"
         style="@style/KeepassDXStyle.Fab.Special"
diff --git a/app/src/main/res/layout/view_date_time.xml b/app/src/main/res/layout/view_date_time.xml
index 7f41dda4d..25f1112c4 100644
--- a/app/src/main/res/layout/view_date_time.xml
+++ b/app/src/main/res/layout/view_date_time.xml
@@ -2,6 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:filterTouchesWhenObscured="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical">
     <androidx.appcompat.widget.AppCompatTextView
diff --git a/app/src/main/res/layout/view_edit_date_time.xml b/app/src/main/res/layout/view_edit_date_time.xml
index bcc218e9a..f1d18aa4e 100644
--- a/app/src/main/res/layout/view_edit_date_time.xml
+++ b/app/src/main/res/layout/view_edit_date_time.xml
@@ -3,6 +3,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:filterTouchesWhenObscured="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools">
     <com.google.android.material.textfield.TextInputLayout
diff --git a/app/src/main/res/layout/view_entry_edit_icon.xml b/app/src/main/res/layout/view_entry_edit_icon.xml
index da4cb548c..6cf78eff9 100644
--- a/app/src/main/res/layout/view_entry_edit_icon.xml
+++ b/app/src/main/res/layout/view_entry_edit_icon.xml
@@ -2,7 +2,8 @@
 <FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    android:filterTouchesWhenObscured="true">
     <!-- Icon -->
     <androidx.appcompat.widget.AppCompatImageButton
         android:id="@+id/template_icon_button"
diff --git a/app/src/main/res/layout/view_keyfile_selection.xml b/app/src/main/res/layout/view_keyfile_selection.xml
index 2aabcc1da..cf54195c5 100644
--- a/app/src/main/res/layout/view_keyfile_selection.xml
+++ b/app/src/main/res/layout/view_keyfile_selection.xml
@@ -7,6 +7,7 @@
     android:layout_marginBottom="@dimen/default_margin"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:filterTouchesWhenObscured="true"
     android:importantForAutofill="noExcludeDescendants"
     tools:ignore="UnusedAttribute">
 
diff --git a/app/src/main/res/layout/view_main_credentials.xml b/app/src/main/res/layout/view_main_credentials.xml
index e0f9ff64e..2d4ec549d 100644
--- a/app/src/main/res/layout/view_main_credentials.xml
+++ b/app/src/main/res/layout/view_main_credentials.xml
@@ -6,6 +6,7 @@
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:filterTouchesWhenObscured="true"
     android:paddingTop="6dp"
     android:paddingLeft="12dp"
     android:paddingStart="12dp"
diff --git a/app/src/main/res/layout/view_passkey.xml b/app/src/main/res/layout/view_passkey.xml
index bf4fd5671..fa9c858a6 100644
--- a/app/src/main/res/layout/view_passkey.xml
+++ b/app/src/main/res/layout/view_passkey.xml
@@ -2,6 +2,7 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:filterTouchesWhenObscured="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools">
 
diff --git a/app/src/main/res/layout/view_search_filters.xml b/app/src/main/res/layout/view_search_filters.xml
index afa67445d..cc78cfc4f 100644
--- a/app/src/main/res/layout/view_search_filters.xml
+++ b/app/src/main/res/layout/view_search_filters.xml
@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:filterTouchesWhenObscured="true"
     android:minHeight="?attr/actionBarSize"
     android:orientation="vertical">
     <androidx.constraintlayout.widget.ConstraintLayout
diff --git a/app/src/main/res/layout/view_template.xml b/app/src/main/res/layout/view_template.xml
index 61d9c01db..1c16ac358 100644
--- a/app/src/main/res/layout/view_template.xml
+++ b/app/src/main/res/layout/view_template.xml
@@ -19,10 +19,10 @@
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
-	xmlns:app="http://schemas.android.com/apk/res-auto"
 	tools:targetApi="o"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
+	android:filterTouchesWhenObscured="true"
 	android:orientation="vertical">
 
 	<androidx.cardview.widget.CardView
diff --git a/fastlane/metadata/android/en-US/changelogs/113.txt b/fastlane/metadata/android/en-US/changelogs/113.txt
index 893dc936e..97250fe50 100644
--- a/fastlane/metadata/android/en-US/changelogs/113.txt
+++ b/fastlane/metadata/android/en-US/changelogs/113.txt
@@ -1,2 +1,3 @@
  * Fix crash in New Android 13 #1321
- * Better backstack management for selection mode
\ No newline at end of file
+ * Better backstack management for selection mode
+ * Prevent Tapjacking #1318
\ No newline at end of file
diff --git a/fastlane/metadata/android/fr-FR/changelogs/113.txt b/fastlane/metadata/android/fr-FR/changelogs/113.txt
index 4ec97018a..0a6d4a36d 100644
--- a/fastlane/metadata/android/fr-FR/changelogs/113.txt
+++ b/fastlane/metadata/android/fr-FR/changelogs/113.txt
@@ -1,2 +1,3 @@
  * Correction d'un crash dans le nouveau Android 13 #1321
- * Meilleure gestion de la pile d'arrière plan pour le mode de sélection
\ No newline at end of file
+ * Meilleure gestion de la pile d'arrière plan pour le mode de sélection
+ * Prevention du Tapjacking #1318
\ No newline at end of file