diff --git a/www/calendar/inner.js b/www/calendar/inner.js
index 9cac57978..b971b2247 100644
--- a/www/calendar/inner.js
+++ b/www/calendar/inner.js
@@ -2209,6 +2209,7 @@ APP.recurrenceRule = {
                     setFormat(allDay);
                 });
             });
+            UI.addTabListener(el);
         };
         var onCalendarEditPopup = function (el) {
             var $el = $(el);
@@ -2276,6 +2277,7 @@ APP.recurrenceRule = {
                     $b.closest('.tui-full-calendar-floating-layer').hide();
                 });
             });
+            UI.addTabListener(el);
         };
         var onPopupRemoved = function () {
             var start, end;
diff --git a/www/common/common-interface.js b/www/common/common-interface.js
index 42e965685..98fd748db 100644
--- a/www/common/common-interface.js
+++ b/www/common/common-interface.js
@@ -577,7 +577,7 @@ define([
         return frame;
     };
 
-    let addTabListener = frame => {
+    let addTabListener = UI.addTabListener = frame => {
         // find focusable elements
         let modalElements = $(frame).find('a, button, input, [tabindex]:not([tabindex="-1"]), textarea').filter(':visible').filter(':not(:disabled)');