From 58e006cdde908e3bfbac85f16c9a11040d366ec6 Mon Sep 17 00:00:00 2001
From: Yuri Kuznetsov <yurikuzn@users.noreply.github.com>
Date: Sun, 31 Jul 2022 19:56:45 +0300
Subject: [PATCH] focus for create modal

---
 client/src/views/record/edit.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/client/src/views/record/edit.js b/client/src/views/record/edit.js
index 899a7728ba..79be561f85 100644
--- a/client/src/views/record/edit.js
+++ b/client/src/views/record/edit.js
@@ -168,7 +168,15 @@ define('views/record/edit', ['views/record/detail'], function (Dep) {
             }
 
             if (this.options.focusForCreate) {
-                this.once('after:render', () => this.focusForCreate());
+                this.once('after:render', () => {
+                    if (this.$el.closest('.modal').length) {
+                        setTimeout(() => this.focusForCreate(), 50);
+
+                        return;
+                    }
+
+                    this.focusForCreate();
+                });
             }
         },