diff --git a/app/controllers/assets_controller.rb b/app/controllers/assets_controller.rb
index 69dc34ec0..8c9b7e364 100644
--- a/app/controllers/assets_controller.rb
+++ b/app/controllers/assets_controller.rb
@@ -323,7 +323,7 @@ class AssetsController < ApplicationController
     end
 
     ActiveRecord::Base.transaction do
-      old_name = @asset.name
+      old_name = @asset.file_name
       @asset.last_modified_by = current_user
       @asset.rename_file(new_name)
       @asset.save!
diff --git a/app/javascript/vue/shared/content/attachments/context_menu.vue b/app/javascript/vue/shared/content/attachments/context_menu.vue
index e618f688e..ede1a2094 100644
--- a/app/javascript/vue/shared/content/attachments/context_menu.vue
+++ b/app/javascript/vue/shared/content/attachments/context_menu.vue
@@ -44,8 +44,7 @@
     <Teleport to="body">
       <RenameAttachmentModal
         v-if="renameModal"
-        :url_path="attachment.attributes.urls.rename"
-        :fileName="attachment.attributes.file_name"
+        :attachment="attachment"
         @attachment:update="$emit('attachment:update', $event)"
         @close="renameModal = false"
       />
diff --git a/app/javascript/vue/shared/content/modal/rename_modal.vue b/app/javascript/vue/shared/content/modal/rename_modal.vue
index 7fee9337c..4de18990c 100644
--- a/app/javascript/vue/shared/content/modal/rename_modal.vue
+++ b/app/javascript/vue/shared/content/modal/rename_modal.vue
@@ -1,6 +1,6 @@
 <template>
   <div ref="modal" @keydown.esc="close" class="modal" id="renameAttachmentModal" tabindex="-1" role="dialog">
-    <div class="modal-dialog modal-md" role="document">
+    <div class="modal-dialog modal-sm" role="document">
       <div class="modal-content">
         <div class="modal-header">
           <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="sn-icon sn-icon-close"></i></button>
@@ -9,9 +9,14 @@
           </h4>
         </div>
         <div class="modal-body">
-          <p>{{ i18n.t('assets.from_clipboard.file_name')}}</p>
-          <div class="sci-input-container" :class="{ 'error': error }" :data-error-text="error">
-            <input ref="input" v-model="name" type="text" class="sci-input-field" @keyup.enter="renameAttachment(name)" required="true" />
+          <label class="sci-label">
+            {{ i18n.t('assets.from_clipboard.file_name')}}
+          </label>
+          <div class="flex gap-1 items-center">
+            <div class="sci-input-container" :class="{ 'error': error }" :data-error-text="error">
+              <input ref="input" v-model="name" type="text" class="sci-input-field" @keyup.enter="renameAttachment(name)" required="true" />
+            </div>
+            <div class="shrink-0">.{{ this.attachment.attributes.file_extension }}</div>
           </div>
         </div>
         <div class="modal-footer">
@@ -31,14 +36,10 @@ export default {
   name: 'RenameAttachmentModal',
   mixins: [modalMixin],
   props: {
-    url_path: {
-      type: String,
+    attachment: {
+      type: Object,
       required: true
     },
-    fileName: {
-      type: String,
-      required: true
-    }
   },
   data() {
     return {
@@ -47,7 +48,7 @@ export default {
     };
   },
   created() {
-    this.name = this.fileName;
+    this.name = this.attachment.attributes.file_name_without_extension;
   },
   watch: {
     name() {
@@ -71,10 +72,9 @@ export default {
         return;
       }
 
-      const payload = { asset: { name: newName } };
-
+      const payload = { asset: { name: `${newName}.${this.attachment.attributes.file_extension}` } };
       try {
-        const response = await axios.patch(this.url_path, payload);
+        const response = await axios.patch(this.attachment.attributes.urls.rename, payload);
         this.$emit('attachment:update', response.data.data);
         this.close();
       } catch (error) {
diff --git a/app/serializers/asset_serializer.rb b/app/serializers/asset_serializer.rb
index 99374b844..9817f448a 100644
--- a/app/serializers/asset_serializer.rb
+++ b/app/serializers/asset_serializer.rb
@@ -9,7 +9,7 @@ class AssetSerializer < ActiveModel::Serializer
   include ApplicationHelper
 
   attributes :file_name, :file_extension, :view_mode, :icon, :urls, :updated_at_formatted,
-             :file_size, :medium_preview, :large_preview, :asset_type, :wopi,
+             :file_size, :medium_preview, :large_preview, :asset_type, :wopi, :file_name_without_extension,
              :wopi_context, :pdf_previewable, :file_size_formatted, :asset_order,
              :updated_at, :metadata, :image_editable, :image_context, :pdf, :attached, :parent_type,
              :edit_version_range
@@ -23,6 +23,10 @@ class AssetSerializer < ActiveModel::Serializer
     object.render_file_name
   end
 
+  def file_name_without_extension
+    File.basename(object.file_name, '.*')
+  end
+
   def file_extension
     File.extname(object.file_name)[1..]
   end