diff --git a/frontend/src/component/releases/ReleasePlanTemplate/MilestoneStrategyMenuCard.tsx b/frontend/src/component/releases/ReleasePlanTemplate/MilestoneStrategyMenuCard.tsx
index e910fbcf0a3a..87dfaa11c188 100644
--- a/frontend/src/component/releases/ReleasePlanTemplate/MilestoneStrategyMenuCard.tsx
+++ b/frontend/src/component/releases/ReleasePlanTemplate/MilestoneStrategyMenuCard.tsx
@@ -34,6 +34,7 @@ const StyledName = styled(StringTruncator)(({ theme }) => ({
 
 const StyledCard = styled('div')(({ theme }) => ({
     display: 'grid',
+    cursor: 'pointer',
     gridTemplateColumns: '3rem 1fr',
     width: '20rem',
     padding: theme.spacing(2),
diff --git a/frontend/src/component/releases/ReleasePlanTemplate/MilestoneStrategySegmentList.tsx b/frontend/src/component/releases/ReleasePlanTemplate/MilestoneStrategySegmentList.tsx
index 5324407a1f5c..b48697ae5ad0 100644
--- a/frontend/src/component/releases/ReleasePlanTemplate/MilestoneStrategySegmentList.tsx
+++ b/frontend/src/component/releases/ReleasePlanTemplate/MilestoneStrategySegmentList.tsx
@@ -41,7 +41,6 @@ export const MilestoneStrategySegmentList = ({
     const lastSegmentIndex = segments.length - 1;
 
     if (segments.length === 0) {
-        console.log('segments.length === 0');
         return null;
     }
 
diff --git a/frontend/src/component/releases/ReleasePlanTemplate/TemplateForm.tsx b/frontend/src/component/releases/ReleasePlanTemplate/TemplateForm.tsx
index 9dd984a4c160..b38da1510640 100644
--- a/frontend/src/component/releases/ReleasePlanTemplate/TemplateForm.tsx
+++ b/frontend/src/component/releases/ReleasePlanTemplate/TemplateForm.tsx
@@ -195,6 +195,7 @@ export const TemplateForm: React.FC<ITemplateFormProps> = ({
                 <SidebarModal
                     label='Add strategy to template milestone'
                     onClose={() => {
+                        setAddUpdateStrategyOpen(false);
                         setStrategyModeEdit(false);
                     }}
                     open={addUpdateStrategyOpen}
@@ -205,6 +206,7 @@ export const TemplateForm: React.FC<ITemplateFormProps> = ({
                         onAddUpdateStrategy={addUpdateStrategy}
                         onCancel={() => {
                             setAddUpdateStrategyOpen(false);
+                            setStrategyModeEdit(false);
                         }}
                         editMode={strategyModeEdit}
                     />