Index: lams_central/web/qb/collection.jsp
===================================================================
diff -u -rce08b5834386d861110869e90237174b8969f3a0 -r5129d828c41c0731ee7889271cffde6421e2146c
--- lams_central/web/qb/collection.jsp	(.../collection.jsp)	(revision ce08b5834386d861110869e90237174b8969f3a0)
+++ lams_central/web/qb/collection.jsp	(.../collection.jsp)	(revision 5129d828c41c0731ee7889271cffde6421e2146c)
@@ -256,7 +256,7 @@
 					+ "\", \"_blank\")' title='Show stats'></i>";
 
 			cellhtml += "<a  title='<fmt:message key='label.edit' />' href='<c:url value='/qb/edit/editQuestion.do'/>?qbQuestionUid=" 
-						+ cellvalue + "&collectionUid=${collection.uid}&KeepThis=true&TB_iframe=true' class='thickbox'>"; 
+						+ cellvalue + "&collectionUid=${collection.uid}&KeepThis=true&TB_iframe=true&modal=true' class='thickbox'>"; 
 			cellhtml += 	"<i class='fa fa-pencil'></i>";
 			cellhtml += "</a>";
 
@@ -394,7 +394,7 @@
 		function initLinkHref() {
 			var questionType = document.getElementById("question-type").selectedIndex + 1;
 			$("#create-question-href").attr("href", 
-					"<c:url value='/qb/edit/newQuestionInit.do'/>?questionType=" + questionType 
+					"<c:url value='/qb/edit/initNewQuestion.do'/>?questionType=" + questionType 
 					+ "&collectionUid=${collection.uid}" 
 					+ "&KeepThis=true&TB_iframe=true&modal=true");
 		};