diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8500455cf32..a4623fb647b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 # Table of Contents
 
+* [Changelog for unreleased](#changelog-for-owncloud-android-client-unreleased-unreleased)
 * [Changelog for 4.5.0](#changelog-for-owncloud-android-client-450-2025-03-24)
 * [Changelog for 4.4.1](#changelog-for-owncloud-android-client-441-2024-10-30)
 * [Changelog for 4.4.0](#changelog-for-owncloud-android-client-440-2024-09-30)
@@ -25,6 +26,27 @@
 * [Changelog for 2.18.1](#changelog-for-owncloud-android-client-2181-2021-07-20)
 * [Changelog for 2.18.0](#changelog-for-owncloud-android-client-2180-2021-05-24)
 * [Changelog for 2.17 versions and below](#changelog-for-217-versions-and-below)
+# Changelog for ownCloud Android Client [unreleased] (UNRELEASED)
+
+The following sections list the changes in ownCloud Android Client unreleased relevant to
+ownCloud admins and users.
+
+[unreleased]: https://github.com/owncloud/android/compare/v4.5.0...master
+
+## Summary
+
+* Bugfix - Confusing behaviour when creating new files using apps provider: [#4560](https://github.com/owncloud/android/issues/4560)
+
+## Details
+
+* Bugfix - Confusing behaviour when creating new files using apps provider: [#4560](https://github.com/owncloud/android/issues/4560)
+
+   The error that appeared when creating a new file using the apps provider has
+   been fixed. Now, the custom tab is opened correctly with the file content.
+
+   https://github.com/owncloud/android/issues/4560
+   https://github.com/owncloud/android/pull/4562
+
 # Changelog for ownCloud Android Client [4.5.0] (2025-03-24)
 
 The following sections list the changes in ownCloud Android Client 4.5.0 relevant to
diff --git a/changelog/unreleased/4562 b/changelog/unreleased/4562
new file mode 100644
index 00000000000..272924c9751
--- /dev/null
+++ b/changelog/unreleased/4562
@@ -0,0 +1,7 @@
+Bugfix: Confusing behaviour when creating new files using apps provider
+
+The error that appeared when creating a new file using the apps provider has been fixed.
+Now, the custom tab is opened correctly with the file content.
+
+https://github.com/owncloud/android/issues/4560
+https://github.com/owncloud/android/pull/4562
diff --git a/owncloudApp/src/main/java/com/owncloud/android/presentation/files/filelist/MainFileListFragment.kt b/owncloudApp/src/main/java/com/owncloud/android/presentation/files/filelist/MainFileListFragment.kt
index a803014f461..8997f953ec2 100644
--- a/owncloudApp/src/main/java/com/owncloud/android/presentation/files/filelist/MainFileListFragment.kt
+++ b/owncloudApp/src/main/java/com/owncloud/android/presentation/files/filelist/MainFileListFragment.kt
@@ -1167,7 +1167,8 @@ class MainFileListFragment : Fragment(),
                 }
                 setOnClickListener {
                     showFilenameTextDialog(appRegistry.ext)
-                    currentDefaultApplication = appRegistry.defaultApplication
+                    currentDefaultApplication = appRegistry.appProviders.find { it.productName == appRegistry.defaultApplication}?.name
+                        ?: appRegistry.defaultApplication
                     dialog.hide()
                 }
             }
diff --git a/owncloudApp/src/main/java/com/owncloud/android/presentation/releasenotes/ReleaseNotesViewModel.kt b/owncloudApp/src/main/java/com/owncloud/android/presentation/releasenotes/ReleaseNotesViewModel.kt
index 9f21017d42f..f21c96728e8 100644
--- a/owncloudApp/src/main/java/com/owncloud/android/presentation/releasenotes/ReleaseNotesViewModel.kt
+++ b/owncloudApp/src/main/java/com/owncloud/android/presentation/releasenotes/ReleaseNotesViewModel.kt
@@ -63,6 +63,11 @@ class ReleaseNotesViewModel(
                 subtitle = R.string.release_notes_4_5_0_subtitle_feedback_in_previews,
                 type = ReleaseNoteType.ENHANCEMENT
             ),
+            ReleaseNote(
+                title = R.string.release_notes_4_5_1_title_strange_behaviour_apps_provider,
+                subtitle = R.string.release_notes_4_5_1_subtitle_strange_behaviour_apps_provider,
+                type = ReleaseNoteType.BUGFIX
+            ),
             ReleaseNote(
                 title = R.string.release_notes_bugfixes_title,
                 subtitle = R.string.release_notes_bugfixes_subtitle,
diff --git a/owncloudApp/src/main/res/values/strings.xml b/owncloudApp/src/main/res/values/strings.xml
index ea9a73b99d7..fb96d1168ef 100644
--- a/owncloudApp/src/main/res/values/strings.xml
+++ b/owncloudApp/src/main/res/values/strings.xml
@@ -742,7 +742,8 @@
     <string name="release_notes_4_5_0_subtitle_quota_improvements">Storage occupation refreshed frequently in file and refresh operations and available in accounts manager view, besides of drawer menu</string>
     <string name="release_notes_4_5_0_title_light_users">Infinite Scale Users Light</string>
     <string name="release_notes_4_5_0_subtitle_light_users">Infinite Scale Users Light (users without personal space) are now supported in the app</string>
-
+    <string name="release_notes_4_5_1_title_strange_behaviour_apps_provider">Fix for files creation via app providers</string>
+    <string name="release_notes_4_5_1_subtitle_strange_behaviour_apps_provider">Files are now opened correctly when they are created using app providers</string>
 
     <!-- Open in web -->
     <string name="ic_action_open_in_web">Open in web</string>
diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/appregistry/responses/AppRegistryResponse.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/appregistry/responses/AppRegistryResponse.kt
index f3f247d9434..2827d8522b8 100644
--- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/appregistry/responses/AppRegistryResponse.kt
+++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/appregistry/responses/AppRegistryResponse.kt
@@ -52,5 +52,7 @@ data class AppRegistryMimeTypeResponse(
 @JsonClass(generateAdapter = true)
 data class AppRegistryProviderResponse(
     val name: String,
+    @Json(name = "product_name")
+    val productName: String,
     val icon: String,
 )
diff --git a/owncloudData/src/main/java/com/owncloud/android/data/appregistry/datasources/implementation/OCRemoteAppRegistryDataSource.kt b/owncloudData/src/main/java/com/owncloud/android/data/appregistry/datasources/implementation/OCRemoteAppRegistryDataSource.kt
index 6a920a29058..4c122c60a96 100644
--- a/owncloudData/src/main/java/com/owncloud/android/data/appregistry/datasources/implementation/OCRemoteAppRegistryDataSource.kt
+++ b/owncloudData/src/main/java/com/owncloud/android/data/appregistry/datasources/implementation/OCRemoteAppRegistryDataSource.kt
@@ -75,6 +75,7 @@ class OCRemoteAppRegistryDataSource(
                     appProviders = appRegistryMimeTypeResponse.appProviders.map { appRegistryProviderResponse ->
                         AppRegistryProvider(
                             name = appRegistryProviderResponse.name,
+                            productName = appRegistryProviderResponse.productName,
                             icon = appRegistryProviderResponse.icon
                         )
                     },
diff --git a/owncloudDomain/src/main/java/com/owncloud/android/domain/appregistry/model/AppRegistry.kt b/owncloudDomain/src/main/java/com/owncloud/android/domain/appregistry/model/AppRegistry.kt
index 06fd733feb1..d93219dc7fc 100644
--- a/owncloudDomain/src/main/java/com/owncloud/android/domain/appregistry/model/AppRegistry.kt
+++ b/owncloudDomain/src/main/java/com/owncloud/android/domain/appregistry/model/AppRegistry.kt
@@ -36,5 +36,6 @@ data class AppRegistryMimeType(
 
 data class AppRegistryProvider(
     val name: String,
+    val productName: String = "",
     val icon: String,
 )