Index: lams_tool_assessment/web/pages/authoring/parts/addessay.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/authoring/parts/addessay.jsp,v
diff -u -r1.7 -r1.7.6.1
--- lams_tool_assessment/web/pages/authoring/parts/addessay.jsp	27 Mar 2009 16:33:24 -0000	1.7
+++ lams_tool_assessment/web/pages/authoring/parts/addessay.jsp	5 Aug 2009 09:13:37 -0000	1.7.6.1
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/authoring/parts/addmatchingpairs.jsp,v
diff -u -r1.6 -r1.6.8.1
--- lams_tool_assessment/web/pages/authoring/parts/addmatchingpairs.jsp	25 Feb 2009 22:13:31 -0000	1.6
+++ lams_tool_assessment/web/pages/authoring/parts/addmatchingpairs.jsp	5 Aug 2009 09:13:37 -0000	1.6.8.1
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/authoring/parts/addmultiplechoice.jsp,v
diff -u -r1.8 -r1.8.8.1
--- lams_tool_assessment/web/pages/authoring/parts/addmultiplechoice.jsp	4 Mar 2009 18:02:03 -0000	1.8
+++ lams_tool_assessment/web/pages/authoring/parts/addmultiplechoice.jsp	5 Aug 2009 09:13:37 -0000	1.8.8.1
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/authoring/parts/addnumerical.jsp,v
diff -u -r1.5 -r1.5.8.1
--- lams_tool_assessment/web/pages/authoring/parts/addnumerical.jsp	4 Mar 2009 18:02:03 -0000	1.5
+++ lams_tool_assessment/web/pages/authoring/parts/addnumerical.jsp	5 Aug 2009 09:13:37 -0000	1.5.8.1
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/authoring/parts/addordering.jsp,v
diff -u -r1.4 -r1.4.8.1
--- lams_tool_assessment/web/pages/authoring/parts/addordering.jsp	25 Feb 2009 22:13:31 -0000	1.4
+++ lams_tool_assessment/web/pages/authoring/parts/addordering.jsp	5 Aug 2009 09:13:37 -0000	1.4.8.1
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/authoring/parts/addshortanswer.jsp,v
diff -u -r1.5 -r1.5.8.1
--- lams_tool_assessment/web/pages/authoring/parts/addshortanswer.jsp	25 Feb 2009 22:13:31 -0000	1.5
+++ lams_tool_assessment/web/pages/authoring/parts/addshortanswer.jsp	5 Aug 2009 09:13:37 -0000	1.5.8.1
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/authoring/parts/addtruefalse.jsp,v
diff -u -r1.4 -r1.4.8.1
--- lams_tool_assessment/web/pages/authoring/parts/addtruefalse.jsp	6 Mar 2009 16:15:10 -0000	1.4
+++ lams_tool_assessment/web/pages/authoring/parts/addtruefalse.jsp	5 Aug 2009 09:13:37 -0000	1.4.8.1
@@ -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>