diff --git a/com.twin.app.shoptime/src/components/MobileSend/MobileSendPopUp.jsx b/com.twin.app.shoptime/src/components/MobileSend/MobileSendPopUp.jsx
index be1cab12..bc286a7a 100644
--- a/com.twin.app.shoptime/src/components/MobileSend/MobileSendPopUp.jsx
+++ b/com.twin.app.shoptime/src/components/MobileSend/MobileSendPopUp.jsx
@@ -46,6 +46,7 @@ import {
   clearCurationCoupon,
   setEventIssueReq,
 } from '../../actions/eventActions';
+import { sendLogShopByMobile } from '../../actions/logActions';
 import {
   ACTIVE_POPUP,
   LOG_TP_NO,
@@ -57,7 +58,6 @@ import TPopUp from '../TPopUp/TPopUp';
 import HistoryPhoneNumber from './HistoryPhoneNumber/HistoryPhoneNumber';
 import css from './MobileSendPopUp.module.less';
 import SMSNumKeyPad from './SMSNumKeyPad';
-import { sendLogShopByMobile } from '../../actions/logActions';
 
 const Container = SpotlightContainerDecorator(
   { enterTo: "last-focused" },
@@ -135,10 +135,8 @@ export default function MobileSendPopUp({
 
   const handleInputClick = () => {
     setKeyPadOff(false);
-    if (recentSentNumber && recentSentNumber.length > 0) {
+    if (recentSentNumber && recentSentNumber.length > 0 && keyPadOff) {
       setMobileNumber(recentSentNumber[0]);
-    } else {
-      setMobileNumber("");
     }
   };
 
@@ -286,7 +284,9 @@ export default function MobileSendPopUp({
           },
         })
       );
-      spotlight.focus();
+      setTimeout(() => {
+        spotlight.focus("history-container");
+      });
     }
   };
 
@@ -586,7 +586,7 @@ export default function MobileSendPopUp({
                   </SpottableComponent>
                 </InputContainer>
                 {keyPadOff ? (
-                  <Container>
+                  <Container spotlightId="history-container">
                     <HistoryPhoneNumber
                       handleClickSelect={handleClickSelect}
                       handleDelete={handleDelete}