diff --git a/resources/vue/components/courseware/CoursewareAccordionContainer.vue b/resources/vue/components/courseware/CoursewareAccordionContainer.vue
index 0cb3b43002118e14c9ed76e3c80d6051c23fe4b8..f1ae440977d568af89fbae027605db39ce6d8b5f 100644
--- a/resources/vue/components/courseware/CoursewareAccordionContainer.vue
+++ b/resources/vue/components/courseware/CoursewareAccordionContainer.vue
@@ -54,7 +54,7 @@
                                     :class="{ 'cw-sortable-handle-dragging': isDragging }"
                                     class="cw-sortable-handle"
                                     tabindex="0"
-                                    role="option"
+                                    role="button"
                                     aria-describedby="operation"
                                     :ref="'sortableHandle' + block.id"
                                     @keydown="keyHandler($event, block.id, index)"
@@ -290,7 +290,7 @@ export default {
                 case 27: // esc
                     this.abortKeyboardSorting(blockId, sectionIndex);
                     break;
-                case 32: // space
+                case 13: // enter
                     e.preventDefault();
                     if (this.keyboardSelected) {
                         this.storeKeyboardSorting(blockId, sectionIndex);
diff --git a/resources/vue/components/courseware/CoursewareListContainer.vue b/resources/vue/components/courseware/CoursewareListContainer.vue
index 74c890ba4b0daf06676da19ca5a50a15b8a80483..7ac036a11f91f5c6eb33fa855febbd5ba754dfbc 100644
--- a/resources/vue/components/courseware/CoursewareListContainer.vue
+++ b/resources/vue/components/courseware/CoursewareListContainer.vue
@@ -42,7 +42,7 @@
                                 :class="{ 'cw-sortable-handle-dragging': isDragging }"
                                 class="cw-sortable-handle"
                                 tabindex="0"
-                                role="option"
+                                role="button"
                                 aria-describedby="operation"
                                 :ref="'sortableHandle' + block.id"
                                 @keydown="keyHandler($event, block.id)"
@@ -186,7 +186,7 @@ export default {
                 case 27: // esc
                     this.abortKeyboardSorting(blockId);
                     break;
-                case 32: // space
+                case 13: // enter
                     e.preventDefault();
                     if (this.keyboardSelected) {
                         this.storeKeyboardSorting(blockId);
diff --git a/resources/vue/components/courseware/CoursewareStructuralElement.vue b/resources/vue/components/courseware/CoursewareStructuralElement.vue
index 427d58232ecb20a9ba9a465ee53cbc5ac435f113..eab4c6a54c2e0dcb777dc5e4b12f8005b2adfe4a 100644
--- a/resources/vue/components/courseware/CoursewareStructuralElement.vue
+++ b/resources/vue/components/courseware/CoursewareStructuralElement.vue
@@ -189,7 +189,7 @@
                                         :class="{ 'cw-sortable-handle-dragging': isDragging }"
                                         class="cw-sortable-handle"
                                         tabindex="0"
-                                        role="option"
+                                        role="button"
                                         aria-describedby="operation"
                                         :ref="'sortableHandle' + container.id"
                                         @keydown="keyHandler($event, container.id)"
@@ -1626,7 +1626,7 @@ export default {
                 case 27: // esc
                     this.abortKeyboardSorting(containerId);
                     break;
-                case 32: // space
+                case 13: // enter
                     e.preventDefault();
                     if (this.keyboardSelected) {
                         this.storeKeyboardSorting(containerId);
diff --git a/resources/vue/components/courseware/CoursewareTabsContainer.vue b/resources/vue/components/courseware/CoursewareTabsContainer.vue
index 114d86cb42b7016058e6fa9f090b675a16196c59..5cb4ee7791253fd0ab5b520d53e42ce4c872a668 100644
--- a/resources/vue/components/courseware/CoursewareTabsContainer.vue
+++ b/resources/vue/components/courseware/CoursewareTabsContainer.vue
@@ -55,7 +55,7 @@
                                         :class="{ 'cw-sortable-handle-dragging': isDragging }"
                                         class="cw-sortable-handle"
                                         tabindex="0"
-                                        role="option"
+                                        role="button"
                                         aria-describedby="operation"
                                         :ref="'sortableHandle' + block.id"
                                         @keydown="keyHandler($event, block.id, index)"
@@ -292,7 +292,7 @@ export default {
                 case 27: // esc
                     this.abortKeyboardSorting(blockId, sectionIndex);
                     break;
-                case 32: // space
+                case 13: // enter
                     e.preventDefault();
                     if (this.keyboardSelected) {
                         this.storeKeyboardSorting(blockId, sectionIndex);
diff --git a/resources/vue/components/courseware/CoursewareTreeItem.vue b/resources/vue/components/courseware/CoursewareTreeItem.vue
index d2d69af90b0acff2bbbe7e00ca8742915d93ee97..820b58a6f38f932caac442f0e30f05457fecc1ff 100644
--- a/resources/vue/components/courseware/CoursewareTreeItem.vue
+++ b/resources/vue/components/courseware/CoursewareTreeItem.vue
@@ -10,6 +10,7 @@
                 :tabindex="0"
                 aria-describedby="operation"
                 ref="sortableHandle"
+                role="button"
                 @keydown="handleKeyEvent"
             >
             </span>
@@ -339,7 +340,7 @@ export default {
         },
         handleKeyEvent(e) {
             switch (e.keyCode) {
-                case 32: // space
+                case 13: // enter
                     e.preventDefault();
                     if (this.keyboardSelected) {
                         this.storeKeyboardSorting();