diff --git a/frontend/src/Editor/AppVersionsManager.jsx b/frontend/src/Editor/AppVersionsManager.jsx
index 4b03c135d0..03892a8c76 100644
--- a/frontend/src/Editor/AppVersionsManager.jsx
+++ b/frontend/src/Editor/AppVersionsManager.jsx
@@ -54,7 +54,7 @@ export const AppVersionsManager = function AppVersionsManager({
       appVersionService
         .create(appId, versionName, createAppVersionFrom.id)
         .then(() => {
-          setShowModal(false);
+          closeModal();
           toast.success('Version Created');
 
           appVersionService.getAll(appId).then((data) => {
@@ -148,8 +148,20 @@ const CreateVersionModal = function CreateVersionModal({
   appVersions,
   showCreateVersionModalPrompt,
 }) {
+  const handleKeyPress = (event) => {
+    if (event.key === 'Enter') {
+      // eslint-disable-next-line no-undef
+      createVersion(versionName, createAppVersionFrom);
+    }
+  };
   return (
-    <Modal show={showModal || showCreateVersionModalPrompt} setShow={setShowModal} title="Create Version">
+    <Modal
+      show={showModal || showCreateVersionModalPrompt}
+      setShow={setShowModal}
+      title="Create Version"
+      autoFocus={false}
+      closeModal={() => setShowModal(false)}
+    >
       <div className="mb-3">
         <div className="col">
           <label className="form-label">Version Name</label>
@@ -160,6 +172,8 @@ const CreateVersionModal = function CreateVersionModal({
             placeholder="Enter version name"
             disabled={isCreatingVersion}
             value={versionName}
+            autoFocus={true}
+            onKeyPress={(e) => handleKeyPress(e)}
           />
         </div>
       </div>