diff --git a/CHANGELOG b/CHANGELOG
index d8645ebc1..acb46bdee 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,6 +4,7 @@ KeePassDX(3.5.0)
  * Better management of mime-types and extensions #1211
  * Add "Screenshot mode" setting #459 #1377 #1354 (Thx @GianpaMX)
  * Hide clipboard sensitive text when copy entry field #1386
+ * Fix attachment download button #1401
 
 KeePassDX(3.4.5)
  * Fix custom data in group (fix KeeShare) #1335
diff --git a/app/src/main/res/layout/item_attachment.xml b/app/src/main/res/layout/item_attachment.xml
index c2c15997e..5dbb9e209 100644
--- a/app/src/main/res/layout/item_attachment.xml
+++ b/app/src/main/res/layout/item_attachment.xml
@@ -129,6 +129,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
+                    android:clickable="false"
                     android:contentDescription="@string/download"
                     android:src="@drawable/ic_file_stream_white_24dp"
                     app:layout_constraintBottom_toBottomOf="parent"
diff --git a/fastlane/metadata/android/en-US/changelogs/115.txt b/fastlane/metadata/android/en-US/changelogs/115.txt
index abc43e60a..a584604c8 100644
--- a/fastlane/metadata/android/en-US/changelogs/115.txt
+++ b/fastlane/metadata/android/en-US/changelogs/115.txt
@@ -2,4 +2,5 @@
  * Better exception management during database save #1346
  * Better management of mime-types and extensions #1211
  * Add "Screenshot mode" setting #459 #1377 #1354 (Thx @GianpaMX)
- * Hide clipboard sensitive text when copy entry field #1386
\ No newline at end of file
+ * Hide clipboard sensitive text when copy entry field #1386
+ * Fix attachment download button #1401