Index: lams_tool_assessment/web/pages/authoring/parts/addessay.jsp
===================================================================
diff -u -r6a20c448cdfdc7895e72dda22c5359be1234cf47 -r377ba295fece8d8af70c64557bde0677500814fe
--- lams_tool_assessment/web/pages/authoring/parts/addessay.jsp	(.../addessay.jsp)	(revision 6a20c448cdfdc7895e72dda22c5359be1234cf47)
+++ lams_tool_assessment/web/pages/authoring/parts/addessay.jsp	(.../addessay.jsp)	(revision 377ba295fece8d8af70c64557bde0677500814fe)
@@ -119,10 +119,10 @@
 
 			<br /><br /><br />
 			<lams:ImgButtonWrapper>
-				<a href="#" onclick="$('#assessmentQuestionForm').submit();" class="button-add-item">
+				<a href="#" onclick="$('#assessmentQuestionForm').submit();" onmousedown="self.focus();" class="button-add-item">
 					<fmt:message key="label.authoring.essay.add.essay" /> 
 				</a>
-				<a href="#" onclick="self.parent.tb_remove();" class="button space-left">
+				<a href="#" onclick="self.parent.tb_remove();" onmousedown="self.focus();" class="button space-left">
 					<fmt:message key="label.cancel" /> 
 				</a>
 			</lams:ImgButtonWrapper>
Index: lams_tool_assessment/web/pages/authoring/parts/addmatchingpairs.jsp
===================================================================
diff -u -r72100e7842f4ba7a26156d51d620235e5af78d5b -r377ba295fece8d8af70c64557bde0677500814fe
--- lams_tool_assessment/web/pages/authoring/parts/addmatchingpairs.jsp	(.../addmatchingpairs.jsp)	(revision 72100e7842f4ba7a26156d51d620235e5af78d5b)
+++ lams_tool_assessment/web/pages/authoring/parts/addmatchingpairs.jsp	(.../addmatchingpairs.jsp)	(revision 377ba295fece8d8af70c64557bde0677500814fe)
@@ -177,10 +177,10 @@
 			
 			<br><br><br>
 			<lams:ImgButtonWrapper>
-				<a href="#" onclick="$('#assessmentQuestionForm').submit();" class="button-add-item">
+				<a href="#" onclick="$('#assessmentQuestionForm').submit();" onmousedown="self.focus();" class="button-add-item">
 					<fmt:message key="label.authoring.matching.pairs.add.matching.pairs" /> 
 				</a>
-				<a href="#" onclick="self.parent.tb_remove();" class="button space-left">
+				<a href="#" onclick="self.parent.tb_remove();" onmousedown="self.focus();" class="button space-left">
 					<fmt:message key="label.cancel" /> 
 				</a>
 			</lams:ImgButtonWrapper>
Index: lams_tool_assessment/web/pages/authoring/parts/addmultiplechoice.jsp
===================================================================
diff -u -r5ea7ebf8f81afa191dd6d761db613896ad530b4d -r377ba295fece8d8af70c64557bde0677500814fe
--- lams_tool_assessment/web/pages/authoring/parts/addmultiplechoice.jsp	(.../addmultiplechoice.jsp)	(revision 5ea7ebf8f81afa191dd6d761db613896ad530b4d)
+++ lams_tool_assessment/web/pages/authoring/parts/addmultiplechoice.jsp	(.../addmultiplechoice.jsp)	(revision 377ba295fece8d8af70c64557bde0677500814fe)
@@ -229,10 +229,10 @@
 			<br><br>
 			
 			<lams:ImgButtonWrapper>
-				<a href="#" onclick="$('#assessmentQuestionForm').submit();" class="button-add-item">
+				<a href="#" onclick="$('#assessmentQuestionForm').submit();" onmousedown="self.focus();" class="button-add-item">
 					<fmt:message key="label.authoring.choice.add.multiple.choice" /> 
 				</a>
-				<a href="#" onclick="self.parent.tb_remove();" class="button space-left">
+				<a href="#" onclick="self.parent.tb_remove();" onmousedown="self.focus();" class="button space-left">
 					<fmt:message key="label.cancel" /> 
 				</a>
 			</lams:ImgButtonWrapper>
Index: lams_tool_assessment/web/pages/authoring/parts/addnumerical.jsp
===================================================================
diff -u -r5ea7ebf8f81afa191dd6d761db613896ad530b4d -r377ba295fece8d8af70c64557bde0677500814fe
--- lams_tool_assessment/web/pages/authoring/parts/addnumerical.jsp	(.../addnumerical.jsp)	(revision 5ea7ebf8f81afa191dd6d761db613896ad530b4d)
+++ lams_tool_assessment/web/pages/authoring/parts/addnumerical.jsp	(.../addnumerical.jsp)	(revision 377ba295fece8d8af70c64557bde0677500814fe)
@@ -245,10 +245,10 @@
 			
 			<br><br><br>
 			<lams:ImgButtonWrapper>
-				<a href="#" onclick="$('#assessmentQuestionForm').submit();" class="button-add-item">
+				<a href="#" onclick="$('#assessmentQuestionForm').submit();" onmousedown="self.focus();" class="button-add-item">
 					<fmt:message key="label.authoring.numerical.add.numerical" /> 
 				</a>
-				<a href="#" onclick="self.parent.tb_remove();" class="button space-left">
+				<a href="#" onclick="self.parent.tb_remove();" onmousedown="self.focus();" class="button space-left">
 					<fmt:message key="label.cancel" /> 
 				</a>
 			</lams:ImgButtonWrapper>
Index: lams_tool_assessment/web/pages/authoring/parts/addordering.jsp
===================================================================
diff -u -r72100e7842f4ba7a26156d51d620235e5af78d5b -r377ba295fece8d8af70c64557bde0677500814fe
--- lams_tool_assessment/web/pages/authoring/parts/addordering.jsp	(.../addordering.jsp)	(revision 72100e7842f4ba7a26156d51d620235e5af78d5b)
+++ lams_tool_assessment/web/pages/authoring/parts/addordering.jsp	(.../addordering.jsp)	(revision 377ba295fece8d8af70c64557bde0677500814fe)
@@ -198,10 +198,10 @@
 			<br><br>
 			
 			<lams:ImgButtonWrapper>
-				<a href="#" onclick="$('#assessmentQuestionForm').submit();" class="button-add-item">
+				<a href="#" onclick="$('#assessmentQuestionForm').submit();" onmousedown="self.focus();" class="button-add-item">
 					<fmt:message key="label.authoring.ordering.add.ordering" /> 
 				</a>
-				<a href="#" onclick="self.parent.tb_remove();" class="button space-left">
+				<a href="#" onclick="self.parent.tb_remove();" onmousedown="self.focus();" class="button space-left">
 					<fmt:message key="label.cancel" /> 
 				</a>
 			</lams:ImgButtonWrapper>
Index: lams_tool_assessment/web/pages/authoring/parts/addshortanswer.jsp
===================================================================
diff -u -r72100e7842f4ba7a26156d51d620235e5af78d5b -r377ba295fece8d8af70c64557bde0677500814fe
--- lams_tool_assessment/web/pages/authoring/parts/addshortanswer.jsp	(.../addshortanswer.jsp)	(revision 72100e7842f4ba7a26156d51d620235e5af78d5b)
+++ lams_tool_assessment/web/pages/authoring/parts/addshortanswer.jsp	(.../addshortanswer.jsp)	(revision 377ba295fece8d8af70c64557bde0677500814fe)
@@ -188,10 +188,10 @@
 			
 			<br><br><br>
 			<lams:ImgButtonWrapper>
-				<a href="#" onclick="$('#assessmentQuestionForm').submit();" class="button-add-item">
+				<a href="#" onclick="$('#assessmentQuestionForm').submit();" onmousedown="self.focus();" class="button-add-item">
 					<fmt:message key="label.authoring.short.answer.add.short.answer" /> 
 				</a>
-				<a href="#" onclick="self.parent.tb_remove();" class="button space-left">
+				<a href="#" onclick="self.parent.tb_remove();" onmousedown="self.focus();" class="button space-left">
 					<fmt:message key="label.cancel" /> 
 				</a>
 			</lams:ImgButtonWrapper>
Index: lams_tool_assessment/web/pages/authoring/parts/addtruefalse.jsp
===================================================================
diff -u -r3dab7c956ec906f70368dfeb1fafde8e720a473c -r377ba295fece8d8af70c64557bde0677500814fe
--- lams_tool_assessment/web/pages/authoring/parts/addtruefalse.jsp	(.../addtruefalse.jsp)	(revision 3dab7c956ec906f70368dfeb1fafde8e720a473c)
+++ lams_tool_assessment/web/pages/authoring/parts/addtruefalse.jsp	(.../addtruefalse.jsp)	(revision 377ba295fece8d8af70c64557bde0677500814fe)
@@ -158,10 +158,10 @@
 			
 			<br><br>
 			<lams:ImgButtonWrapper>
-				<a href="#" onclick="$('#assessmentQuestionForm').submit();" class="button-add-item">
+				<a href="#" onclick="$('#assessmentQuestionForm').submit();" onmousedown="self.focus();" class="button-add-item">
 					<fmt:message key="label.authoring.true.false.add.true.false" /> 
 				</a>
-				<a href="#" onclick="self.parent.tb_remove();" class="button space-left">
+				<a href="#" onclick="self.parent.tb_remove();" onmousedown="self.focus();" class="button space-left">
 					<fmt:message key="label.cancel" /> 
 				</a>
 			</lams:ImgButtonWrapper>