diff --git a/app/src/main/java/com/owncloud/android/files/FetchTemplateOperation.java b/app/src/main/java/com/owncloud/android/files/FetchTemplateOperation.java
deleted file mode 100644
index e16fafa6f562..000000000000
--- a/app/src/main/java/com/owncloud/android/files/FetchTemplateOperation.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Nextcloud - Android Client
- *
- * SPDX-FileCopyrightText: 2018 Tobias Kaminsky <tobias@kaminsky.me>
- * SPDX-FileCopyrightText: 2018 Nextcloud GmbH
- * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
- */
-package com.owncloud.android.files;
-
-import com.owncloud.android.datamodel.Template;
-import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.operations.RemoteOperation;
-import com.owncloud.android.lib.common.operations.RemoteOperationResult;
-import com.owncloud.android.lib.common.utils.Log_OC;
-import com.owncloud.android.ui.dialog.ChooseRichDocumentsTemplateDialogFragment;
-
-import org.apache.commons.httpclient.HttpStatus;
-import org.apache.commons.httpclient.methods.GetMethod;
-import org.json.JSONArray;
-import org.json.JSONObject;
-
-import java.util.ArrayList;
-import java.util.Locale;
-
-public class FetchTemplateOperation extends RemoteOperation {
-    private static final String TAG = FetchTemplateOperation.class.getSimpleName();
-    private static final int SYNC_READ_TIMEOUT = 40000;
-    private static final int SYNC_CONNECTION_TIMEOUT = 5000;
-    private static final String TEMPLATE_URL = "/ocs/v2.php/apps/richdocuments/api/v1/templates/";
-
-    private ChooseRichDocumentsTemplateDialogFragment.Type type;
-
-    // JSON node names
-    private static final String NODE_OCS = "ocs";
-    private static final String NODE_DATA = "data";
-    private static final String JSON_FORMAT = "?format=json";
-
-    public FetchTemplateOperation(ChooseRichDocumentsTemplateDialogFragment.Type type) {
-        this.type = type;
-    }
-
-    protected RemoteOperationResult run(OwnCloudClient client) {
-        RemoteOperationResult result;
-        GetMethod getMethod = null;
-
-        try {
-
-            getMethod = new GetMethod(client.getBaseUri() + TEMPLATE_URL + type.toString().toLowerCase(Locale.ENGLISH) +
-                JSON_FORMAT);
-
-            // remote request
-            getMethod.addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE);
-
-            int status = client.executeMethod(getMethod, SYNC_READ_TIMEOUT, SYNC_CONNECTION_TIMEOUT);
-
-            if (status == HttpStatus.SC_OK) {
-                String response = getMethod.getResponseBodyAsString();
-
-                // Parse the response
-                JSONObject respJSON = new JSONObject(response);
-                JSONArray templates = respJSON.getJSONObject(NODE_OCS).getJSONArray(NODE_DATA);
-
-                ArrayList<Object> templateArray = new ArrayList<>();
-
-                for (int i = 0; i < templates.length(); i++) {
-                    JSONObject templateObject = templates.getJSONObject(i);
-
-                    templateArray.add(new Template(templateObject.getLong("id"),
-                                                   templateObject.getString("name"),
-                                                   templateObject.optString("preview"),
-                                                   Template.Type.parse(templateObject.getString("type")
-                                                                           .toUpperCase(Locale.ROOT)),
-                                                   templateObject.getString("extension")));
-                }
-
-                result = new RemoteOperationResult(true, getMethod);
-                result.setData(templateArray);
-            } else {
-                result = new RemoteOperationResult(false, getMethod);
-                client.exhaustResponse(getMethod.getResponseBodyAsStream());
-            }
-        } catch (Exception e) {
-            result = new RemoteOperationResult(e);
-            Log_OC.e(TAG, "Get templates for typ " + type + " failed: " + result.getLogMessage(),
-                result.getException());
-        } finally {
-            if (getMethod != null) {
-                getMethod.releaseConnection();
-            }
-        }
-        return result;
-    }
-}
diff --git a/app/src/main/java/com/owncloud/android/files/FetchTemplateOperation.kt b/app/src/main/java/com/owncloud/android/files/FetchTemplateOperation.kt
new file mode 100644
index 000000000000..7c37b4d0576a
--- /dev/null
+++ b/app/src/main/java/com/owncloud/android/files/FetchTemplateOperation.kt
@@ -0,0 +1,81 @@
+/*
+ * Nextcloud - Android Client
+ *
+ * SPDX-FileCopyrightText: 2026 Alper Ozturk <alper.ozturk@nextcloud.com>
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+package com.owncloud.android.files
+
+import com.owncloud.android.datamodel.Template
+import com.owncloud.android.lib.common.OwnCloudClient
+import com.owncloud.android.lib.common.operations.RemoteOperation
+import com.owncloud.android.lib.common.operations.RemoteOperationResult
+import com.owncloud.android.lib.common.utils.Log_OC
+import com.owncloud.android.ui.dialog.ChooseRichDocumentsTemplateDialogFragment
+import org.apache.commons.httpclient.HttpStatus
+import org.apache.commons.httpclient.methods.GetMethod
+import org.json.JSONObject
+
+class FetchTemplateOperation(private val type: ChooseRichDocumentsTemplateDialogFragment.Type) :
+    RemoteOperation<Any>() {
+
+    @Suppress("TooGenericExceptionCaught")
+    override fun run(client: OwnCloudClient): RemoteOperationResult<Any> {
+        var getMethod: GetMethod? = null
+
+        return try {
+            getMethod = GetMethod(templateUrl(client.baseUri.toString())).apply {
+                addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE)
+            }
+
+            val status = client.executeMethod(getMethod, SYNC_READ_TIMEOUT, SYNC_CONNECTION_TIMEOUT)
+            if (status != HttpStatus.SC_OK) {
+                client.exhaustResponse(getMethod.responseBodyAsStream)
+                return RemoteOperationResult(false, getMethod)
+            }
+
+            val templates = parseTemplates(getMethod.responseBodyAsString)
+            RemoteOperationResult<Any>(true, getMethod).apply { setData(ArrayList<Any>(templates)) }
+        } catch (e: Exception) {
+            RemoteOperationResult<Any>(e).also {
+                Log_OC.e(TAG, "Get templates for type $type failed: ${it.logMessage}", it.exception)
+            }
+        } finally {
+            getMethod?.releaseConnection()
+        }
+    }
+
+    private fun templateUrl(baseUri: String): String = baseUri + TEMPLATE_URL + type.name.lowercase() + JSON_FORMAT
+
+    private fun parseTemplates(response: String): List<Template> {
+        val data = JSONObject(response).getJSONObject(NODE_OCS).getJSONArray(NODE_DATA)
+
+        return (0 until data.length()).map { index ->
+            data.getJSONObject(index).toTemplate()
+        }
+    }
+
+    private fun JSONObject.toTemplate(): Template = Template(
+        getLong(NODE_ID),
+        getString(NODE_NAME),
+        optString(NODE_PREVIEW),
+        Template.Type.parse(getString(NODE_TYPE)),
+        getString(NODE_EXTENSION)
+    )
+
+    companion object {
+        private val TAG = FetchTemplateOperation::class.java.simpleName
+        private const val SYNC_READ_TIMEOUT = 40000
+        private const val SYNC_CONNECTION_TIMEOUT = 5000
+        private const val TEMPLATE_URL = "/ocs/v2.php/apps/richdocuments/api/v1/templates/"
+        private const val JSON_FORMAT = "?format=json"
+
+        private const val NODE_OCS = "ocs"
+        private const val NODE_DATA = "data"
+        private const val NODE_ID = "id"
+        private const val NODE_NAME = "name"
+        private const val NODE_PREVIEW = "preview"
+        private const val NODE_TYPE = "type"
+        private const val NODE_EXTENSION = "extension"
+    }
+}
diff --git a/app/src/main/java/com/owncloud/android/ui/dialog/ChooseTemplateDialogFragment.kt b/app/src/main/java/com/owncloud/android/ui/dialog/ChooseTemplateDialogFragment.kt
index 733205a9db3a..44c8bab6819b 100644
--- a/app/src/main/java/com/owncloud/android/ui/dialog/ChooseTemplateDialogFragment.kt
+++ b/app/src/main/java/com/owncloud/android/ui/dialog/ChooseTemplateDialogFragment.kt
@@ -65,6 +65,7 @@ class ChooseTemplateDialogFragment :
     Injectable {
 
     private lateinit var fileNames: MutableSet<String>
+    private var hasUserInteracted = false
 
     @Inject
     lateinit var clientFactory: ClientFactory
@@ -142,6 +143,7 @@ class ChooseTemplateDialogFragment :
             override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) = Unit
             override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) = Unit
             override fun afterTextChanged(s: Editable) {
+                hasUserInteracted = true
                 checkFileNameAfterEachType()
             }
         })
@@ -224,71 +226,59 @@ class ChooseTemplateDialogFragment :
     private fun getOCCapability(): OCCapability = fileDataStorageManager.getCapability(currentAccount.user.accountName)
 
     override fun onClick(v: View) {
+        val selectedTemplate = adapter?.selectedTemplate
+            ?: return DisplayUtils.showSnackMessage(binding.list, R.string.select_one_template)
+
+        val state = resolveFilenameState()
+        if (state !is TemplateFilenameState.Valid) {
+            state.errorMessage?.let { DisplayUtils.showSnackMessage(requireActivity(), it.toString()) }
+            return
+        }
+
         val name = binding.filename.text.toString()
         val path = parentFolder?.remotePath + name
-        val selectedTemplate = adapter?.selectedTemplate
+        val fullPath = if (name.endsWith(selectedTemplate.extension)) {
+            path
+        } else {
+            path + DOT + selectedTemplate.extension
+        }
 
-        val errorMessage = FileNameValidator.checkFileName(name, getOCCapability(), requireContext())
+        createFromTemplate(selectedTemplate, fullPath)
+    }
 
-        when {
-            selectedTemplate == null -> {
-                DisplayUtils.showSnackMessage(binding.list, R.string.select_one_template)
-            }
+    private fun resolveFilenameState(): TemplateFilenameState {
+        val selectedTemplate = adapter?.selectedTemplate ?: return TemplateFilenameState.NoTemplateSelected
+        val name = binding.filename.text.toString().trim()
+        val validationError = FileNameValidator.checkFileName(name, getOCCapability(), requireContext(), fileNames)
 
-            errorMessage != null -> {
-                DisplayUtils.showSnackMessage(requireActivity(), errorMessage)
-            }
+        return when {
+            name.equals(DOT + selectedTemplate.extension, ignoreCase = true) ->
+                TemplateFilenameState.JustExtension(getString(R.string.enter_filename))
 
-            name.equals(DOT + selectedTemplate.extension, ignoreCase = true) -> {
-                DisplayUtils.showSnackMessage(binding.list, R.string.enter_filename)
-            }
+            validationError != null -> TemplateFilenameState.Invalid(validationError)
 
-            else -> {
-                val fullPath = if (!name.endsWith(selectedTemplate.extension)) {
-                    path + DOT + selectedTemplate.extension
-                } else {
-                    path
-                }
-                createFromTemplate(selectedTemplate, fullPath)
-            }
+            FileNameValidator.isFileHidden(name) ->
+                TemplateFilenameState.HiddenName(getText(R.string.hidden_file_name_warning))
+
+            name.substringAfterLast(DOT) != selectedTemplate.extension ->
+                TemplateFilenameState.ChangedExtension(getString(R.string.extension_cannot_be_changed))
+
+            else -> TemplateFilenameState.Valid
         }
     }
 
     private fun checkFileNameAfterEachType() {
-        if (positiveButton == null) return
+        val positiveButton = positiveButton ?: return
+        val state = resolveFilenameState()
 
-        val selectedTemplate = adapter?.selectedTemplate
-        val name = binding.filename.text.toString().trim()
-        val isNameJustExtension = selectedTemplate != null &&
-            name.equals(
-                DOT + selectedTemplate.extension,
-                ignoreCase = true
-            )
-        val fileNameValidatorResult =
-            FileNameValidator.checkFileName(name, getOCCapability(), requireContext(), fileNames)
-
-        val errorMessage = when {
-            isNameJustExtension -> null
-            fileNameValidatorResult != null -> fileNameValidatorResult
-            else -> null
-        }
+        val isValid = state is TemplateFilenameState.Valid
+        positiveButton.isEnabled = isValid
+        positiveButton.isClickable = isValid
 
-        val isNameValid = (errorMessage == null) && !name.equals(DOT + selectedTemplate?.extension, ignoreCase = true)
-        val isHiddenFileName = FileNameValidator.isFileHidden(name)
-        val isChangedExtension = name.substringAfterLast(DOT) != selectedTemplate?.extension
+        if (!hasUserInteracted) return
 
-        binding.filenameContainer.isErrorEnabled = !isNameValid || isHiddenFileName || isChangedExtension
-        binding.filenameContainer.error = when {
-            !isNameValid -> errorMessage ?: getString(R.string.enter_filename)
-            isHiddenFileName -> getText(R.string.hidden_file_name_warning)
-            isChangedExtension -> getString(R.string.extension_cannot_be_changed)
-            else -> null
-        }
-
-        positiveButton?.apply {
-            isEnabled = isNameValid && !isHiddenFileName && !isChangedExtension
-            isClickable = isEnabled
-        }
+        binding.filenameContainer.isErrorEnabled = state.errorMessage != null
+        binding.filenameContainer.error = state.errorMessage
     }
 
     @Suppress("LongParameterList", "DEPRECATION")
@@ -406,7 +396,8 @@ class ChooseTemplateDialogFragment :
             }
 
             if (templateList.templates.isEmpty()) {
-                DisplayUtils.showSnackMessage(fragment.binding.list, R.string.error_retrieving_templates)
+                fragment.dismiss()
+                DisplayUtils.showSnackMessage(fragment.requireActivity(), R.string.error_retrieving_templates)
                 return
             }
 
diff --git a/app/src/main/java/com/owncloud/android/ui/dialog/TemplateFilenameState.kt b/app/src/main/java/com/owncloud/android/ui/dialog/TemplateFilenameState.kt
new file mode 100644
index 000000000000..f300d4c1b9ea
--- /dev/null
+++ b/app/src/main/java/com/owncloud/android/ui/dialog/TemplateFilenameState.kt
@@ -0,0 +1,16 @@
+/*
+ * Nextcloud - Android Client
+ *
+ * SPDX-FileCopyrightText: 2026 Alper Ozturk <alper.ozturk@nextcloud.com>
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+package com.owncloud.android.ui.dialog
+
+sealed class TemplateFilenameState(val errorMessage: CharSequence?) {
+    data object Valid : TemplateFilenameState(null)
+    data object NoTemplateSelected : TemplateFilenameState(null)
+    class JustExtension(message: CharSequence) : TemplateFilenameState(message)
+    class HiddenName(message: CharSequence) : TemplateFilenameState(message)
+    class ChangedExtension(message: CharSequence) : TemplateFilenameState(message)
+    class Invalid(message: CharSequence) : TemplateFilenameState(message)
+}