diff --git a/src/components/DialogAssetEdit/index.tsx b/src/components/DialogAssetEdit/index.tsx
index 165dda41..08dc72a6 100644
--- a/src/components/DialogAssetEdit/index.tsx
+++ b/src/components/DialogAssetEdit/index.tsx
@@ -20,7 +20,6 @@ import AssetMetadata from '../AssetMetadata'
 import Dialog from '../Dialog'
 import DocumentList from '../DocumentList'
 import FileAssetPreview from '../FileAssetPreview'
-import FormFieldInputFilename from '../FormFieldInputFilename'
 import FormFieldInputTags from '../FormFieldInputTags'
 import FormFieldInputText from '../FormFieldInputText'
 import FormFieldInputTextarea from '../FormFieldInputTextarea'
@@ -35,14 +34,9 @@ type Props = {
 type FormData = yup.InferType<typeof formSchema>
 
 const formSchema = yup.object().shape({
-  originalFilename: yup.string().required('Filename cannot be empty')
+  originalFilename: yup.string().trim().required('Filename cannot be empty')
 })
 
-const getFilenameWithoutExtension = (asset?: Asset): string | undefined => {
-  const extensionIndex = asset?.originalFilename?.toLowerCase().lastIndexOf(`.${asset.extension}`)
-  return asset?.originalFilename?.slice(0, extensionIndex)
-}
-
 const DialogAssetEdit = (props: Props) => {
   const {
     children,
@@ -73,7 +67,7 @@ const DialogAssetEdit = (props: Props) => {
   const generateDefaultValues = (asset?: Asset) => ({
     altText: asset?.altText || '',
     description: asset?.description || '',
-    originalFilename: asset ? getFilenameWithoutExtension(asset) : undefined,
+    originalFilename: asset?.originalFilename || '',
     opt: {media: {tags: assetTagOptions}},
     title: asset?.title || ''
   })
@@ -165,9 +159,7 @@ const DialogAssetEdit = (props: Props) => {
                   _weak: true
                 })) || null
             }
-          },
-          // Append extension to filename
-          originalFilename: `${sanitizedFormData.originalFilename}.${assetItem?.asset.extension}`
+          }
         }
       })
     )
@@ -323,14 +315,13 @@ const DialogAssetEdit = (props: Props) => {
                   value={assetTagOptions}
                 />
                 {/* Filename */}
-                <FormFieldInputFilename
+                <FormFieldInputText
                   disabled={formUpdating}
                   error={errors?.originalFilename}
-                  extension={currentAsset?.extension || ''}
                   label="Filename"
                   name="originalFilename"
                   ref={register}
-                  value={getFilenameWithoutExtension(currentAsset)}
+                  value={currentAsset?.originalFilename}
                 />
                 {/* Title */}
                 <FormFieldInputText
diff --git a/src/components/FormFieldInputFilename/index.tsx b/src/components/FormFieldInputFilename/index.tsx
deleted file mode 100644
index 30e4cb22..00000000
--- a/src/components/FormFieldInputFilename/index.tsx
+++ /dev/null
@@ -1,50 +0,0 @@
-import {Box, Flex, TextInput} from '@sanity/ui'
-import React, {forwardRef} from 'react'
-import {FieldError} from 'react-hook-form'
-
-import FormFieldInputLabel from '../FormFieldInputLabel'
-
-type Props = {
-  description?: string
-  extension: string
-  disabled?: boolean
-  error?: FieldError
-  label: string
-  name: string
-  placeholder?: string
-  value?: string
-}
-
-type Ref = HTMLInputElement
-
-const FormFieldInputText = forwardRef<Ref, Props>((props: Props, ref) => {
-  const {description, disabled, error, extension, label, name, placeholder, value} = props
-
-  return (
-    <Box>
-      {/* Label */}
-      <FormFieldInputLabel description={description} error={error} label={label} name={name} />
-
-      {/* Input */}
-      <Flex>
-        <Box style={{flexGrow: 1}}>
-          <TextInput
-            autoComplete="off"
-            autoFocus
-            defaultValue={value}
-            disabled={disabled}
-            id={name}
-            name={name}
-            placeholder={placeholder}
-            ref={ref}
-          />
-        </Box>
-        <Box style={{width: '70px'}}>
-          <TextInput defaultValue={`.${extension}`} disabled />
-        </Box>
-      </Flex>
-    </Box>
-  )
-})
-
-export default FormFieldInputText