diff --git a/public/react/src/modules/courses/busyWork/CommonWorkItem.js b/public/react/src/modules/courses/busyWork/CommonWorkItem.js
index 2610a7782..e5c74f5b1 100644
--- a/public/react/src/modules/courses/busyWork/CommonWorkItem.js
+++ b/public/react/src/modules/courses/busyWork/CommonWorkItem.js
@@ -16,7 +16,12 @@ class CommonWorkItem extends Component{
     }
   }
   onItemClick = (item) => {
-    this.props.toWorkListPage(this.props.match.params, item.homework_id)
+    const isStudent = this.props.isStudent()
+    if (isStudent) {
+      this.props.toWorkQuestionPage(this.props.match.params, item.homework_id)
+    } else {
+      this.props.toWorkListPage(this.props.match.params, item.homework_id)
+    }
   }
   sendMoreAttachment = (item) => {
     this.handleItem = item;
diff --git a/public/react/src/modules/courses/busyWork/common.js b/public/react/src/modules/courses/busyWork/common.js
index 8c37e78d2..7f54a0623 100644
--- a/public/react/src/modules/courses/busyWork/common.js
+++ b/public/react/src/modules/courses/busyWork/common.js
@@ -129,7 +129,7 @@ export function RouteHOC(options = {}) {
       toWorkQuestionPage = (_courseId, _workId) => {
         const secondName = this.getModuleName()
         if (typeof _courseId == "object") {
-          const workId = _courseId.workId
+          const workId = _workId || _courseId.workId
           const courseId = _courseId.coursesId
           this.props.history.push(`/courses/${courseId}/${secondName}/${workId}/question`)
         } else {