diff --git a/main/inc/lib/exercise.lib.php b/main/inc/lib/exercise.lib.php
index b88ca279c5..22fa24381c 100644
--- a/main/inc/lib/exercise.lib.php
+++ b/main/inc/lib/exercise.lib.php
@@ -115,9 +115,12 @@ class ExerciseLib
                 if ($answerType == DRAGGABLE) {
                     $isVertical = $objQuestionTmp->extra == 'v';
 
-                    $s .= '<div class="col-md-12 ui-widget ui-helper-clearfix">
-                        <div class="clearfix">
-                        <ul class="exercise-draggable-answer ui-helper-reset ui-helper-clearfix '.($isVertical ? '' : 'list-inline').'">';
+                    $s .= '
+                        <div class="col-md-12 ui-widget ui-helper-clearfix">
+                            <div class="clearfix">
+                            <ul class="exercise-draggable-answer '.($isVertical ? '' : 'list-inline').'"
+                                id="question-'.$questionId.'" data-question="'.$questionId.'">
+                    ';
                 } else {
                     $s .= '<div id="drag' . $questionId . '_question" class="drag_question">
                            <table class="data_table">';
diff --git a/main/template/default/exercise/submit.js.tpl b/main/template/default/exercise/submit.js.tpl
index 25e20c1636..bce9313da3 100644
--- a/main/template/default/exercise/submit.js.tpl
+++ b/main/template/default/exercise/submit.js.tpl
@@ -28,15 +28,21 @@ var DraggableAnswer = {
         });
     },
     recycleItem: function (item) {
+        var droppedId = item.attr('id'),
+            originSelectId = 'window_' + droppedId + '_select',
+            idParts = droppedId.split('_'),
+            questionId = parseInt(idParts[0]) || 0;
+
+        if (!questionId) {
+            return;
+        }
+
         item.fadeOut(function () {
             item
-                .appendTo(DraggableAnswer.gallery)
+                .appendTo(DraggableAnswer.gallery.filter('[data-question="' + questionId + '"]'))
                 .fadeIn();
         });
 
-        var droppedId = item.attr('id'),
-            originSelectId = 'window_' + droppedId + '_select';
-
         $('#' + originSelectId + ' option').prop('selected', false);
         $('#' + originSelectId + ' option:first').prop('selected', true);
     },