diff --git a/app/src/main/java/com/kunzisoft/keepass/database/element/Database.kt b/app/src/main/java/com/kunzisoft/keepass/database/element/Database.kt
index 4b884904f..9b30be6cb 100644
--- a/app/src/main/java/com/kunzisoft/keepass/database/element/Database.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/database/element/Database.kt
@@ -748,11 +748,15 @@ class Database {
                     }
                     databaseToMerge.mDatabaseKDB?.let { databaseKDBToMerge ->
                         databaseMerger.merge(databaseKDBToMerge)
-                        this.dataModifiedSinceLastLoading = true
+                        if (databaseToMergeUri != null) {
+                            this.dataModifiedSinceLastLoading = true
+                        }
                     }
                     databaseToMerge.mDatabaseKDBX?.let { databaseKDBXToMerge ->
                         databaseMerger.merge(databaseKDBXToMerge)
-                        this.dataModifiedSinceLastLoading = true
+                        if (databaseToMergeUri != null) {
+                            this.dataModifiedSinceLastLoading = true
+                        }
                     }
                 }
             } else {
diff --git a/app/src/main/res/layout/activity_password.xml b/app/src/main/res/layout/activity_password.xml
index d3843b80c..975c66c5e 100644
--- a/app/src/main/res/layout/activity_password.xml
+++ b/app/src/main/res/layout/activity_password.xml
@@ -119,7 +119,8 @@
                     <com.kunzisoft.keepass.view.MainCredentialView
                         android:id="@+id/activity_password_credentials"
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content" />
+                        android:layout_height="wrap_content"
+                        android:background="?android:attr/windowBackground" />
                 </FrameLayout>
             </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/layout/view_main_credentials.xml b/app/src/main/res/layout/view_main_credentials.xml
index 73b2cdbc3..254b53e01 100644
--- a/app/src/main/res/layout/view_main_credentials.xml
+++ b/app/src/main/res/layout/view_main_credentials.xml
@@ -12,7 +12,6 @@
     android:paddingRight="12dp"
     android:paddingEnd="12dp"
     android:paddingBottom="12dp"
-    android:background="?android:attr/windowBackground"
     tools:targetApi="lollipop">
 
     <!-- Password Input -->