Index: lams_central/src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java
===================================================================
diff -u -rf9c66e78afa51f175afcaf22ee81f9b3460afea8 -rda30e197f54c6bc1c0d6d9d5dbcdde3c4632d329
--- lams_central/src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java	(.../EditQbQuestionController.java)	(revision f9c66e78afa51f175afcaf22ee81f9b3460afea8)
+++ lams_central/src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java	(.../EditQbQuestionController.java)	(revision da30e197f54c6bc1c0d6d9d5dbcdde3c4632d329)
@@ -2,8 +2,10 @@
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Date;
 import java.util.List;
+import java.util.Optional;
 import java.util.TreeSet;
 
 import javax.servlet.ServletException;
@@ -107,13 +109,15 @@
      * Display edit page for existed assessment question.
      */
     @RequestMapping("/editQuestion")
-    public String editQuestion(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+    public String editQuestion(HttpServletRequest request, HttpServletResponse response,
+	    @RequestParam(defaultValue = "-1") Long collectionUid) throws ServletException, IOException {
 	Long qbQuestionUid = WebUtil.readLongParam(request, "qbQuestionUid");
 	QbQuestion qbQuestion = qbService.getQbQuestionByUid(qbQuestionUid);
 	if (qbQuestion == null) {
 	    throw new RuntimeException("QbQuestion with uid:" + qbQuestionUid + " was not found!");
 	}
 	QbQuestionForm questionForm = new QbQuestionForm();
+	questionForm.setCollectionUid(collectionUid);
 	//we need to set form as a request attribute, as long as we use jsps from another context from the Assessment tool
 	request.setAttribute("assessmentQuestionForm", questionForm);
 	QbUtils.fillFormWithQbQuestion(qbQuestion, questionForm, request);
@@ -144,15 +148,17 @@
 	    HttpServletRequest request, HttpServletResponse response) throws IOException {
 	//find according question
 	QbQuestion qbQuestion = null;
+	Long oldQuestionUid = null;
+	
 	// add
 	if (questionForm.getDisplayOrder() == -1) { 
 	    qbQuestion = new QbQuestion();
 	    qbQuestion.setType(questionForm.getQuestionType());
 	    
 	// edit
 	} else {
-	    Long qbQuestionUid = Long.valueOf(questionForm.getDisplayOrder());
-	    qbQuestion = qbService.getQbQuestionByUid(qbQuestionUid);
+	    oldQuestionUid = Long.valueOf(questionForm.getDisplayOrder());
+	    qbQuestion = qbService.getQbQuestionByUid(oldQuestionUid);
 	}
 	
 	boolean IS_AUTHORING_RESTRICTED = false;
@@ -178,12 +184,23 @@
 	    }
 		break;
 	}
+	boolean belongsToNoCollection = qbQuestion.getUid() == null;
 	userManagementService.save(qbQuestion);
 	
 	//in case of new question - add it to specified collection
-	if (questionForm.getDisplayOrder() == -1) {
-	    Long collectionUid = WebUtil.readLongParam(request, "collectionUid");
-	    qbService.addQuestionToCollection(collectionUid, qbQuestion.getUid(), false);
+	if (belongsToNoCollection) {
+
+	    Long collectionUid = questionForm.getCollectionUid();
+	    //try to get collection from the old question
+	    if (collectionUid != null && collectionUid.equals(-1L)) {
+		Collection<QbCollection> existingCollections = qbService.getQuestionCollections(oldQuestionUid);
+		collectionUid = existingCollections.stream().findFirst().map(collection -> collection.getUid())
+			.orElse(null);
+	    }
+
+	    if (collectionUid != null && !collectionUid.equals(-1L)) {
+		qbService.addQuestionToCollection(collectionUid, qbQuestion.getUid(), false);
+	    }
 	}
 	
 	// add question case - return nothing
Index: lams_central/web/qb/collection.jsp
===================================================================
diff -u -r57a3647e9f7b79d5fe02d9727194311b4930d867 -rda30e197f54c6bc1c0d6d9d5dbcdde3c4632d329
--- lams_central/web/qb/collection.jsp	(.../collection.jsp)	(revision 57a3647e9f7b79d5fe02d9727194311b4930d867)
+++ lams_central/web/qb/collection.jsp	(.../collection.jsp)	(revision da30e197f54c6bc1c0d6d9d5dbcdde3c4632d329)
@@ -163,7 +163,7 @@
 			var cellhtml = "<i class='fa fa-bar-chart' onClick='javascript:window.open(\"<lams:LAMSURL/>qb/stats/show.do?qbQuestionUid=" + cellvalue 
 					+ "\", \"_blank\")' title='Show stats'></i>";
 
-			cellhtml += "<a href='<c:url value='/qb/edit/editQuestion.do'/>?qbQuestionUid=" + cellvalue + "&KeepThis=true&TB_iframe=true' class='thickbox'>"; 
+			cellhtml += "<a href='<c:url value='/qb/edit/editQuestion.do'/>?qbQuestionUid=" + cellvalue + "&collectionUid=${collection.uid}&KeepThis=true&TB_iframe=true' class='thickbox'>"; 
 			cellhtml += 	"<i class='fa fa-pencil' title='<fmt:message key='label.edit' />'></i>";
 			cellhtml += "</a>";