diff --git a/typo3/sysext/backend/Classes/Form/Element/AbstractFormElement.php b/typo3/sysext/backend/Classes/Form/Element/AbstractFormElement.php
index 084abd2e9dcce0fe8b141d29115efc4c43f15c09..5753428934841a87c37ec298a588e370046d1d76 100644
--- a/typo3/sysext/backend/Classes/Form/Element/AbstractFormElement.php
+++ b/typo3/sysext/backend/Classes/Form/Element/AbstractFormElement.php
@@ -591,7 +591,7 @@ abstract class AbstractFormElement extends AbstractNode
                 if ($sSize >= 5) {
                     $icons['L'][] = '
 						<a href="#"
-							class="btn btn-default t3-btn-moveoption-top"
+							class="btn btn-default t3js-btn-moveoption-top"
 							data-fieldname="' . $fName . '"
 							title="' . htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_core.xlf:labels.move_to_top')) . '">
 							' . $this->iconFactory->getIcon('actions-move-to-top', Icon::SIZE_SMALL)->render() . '
@@ -599,14 +599,14 @@ abstract class AbstractFormElement extends AbstractNode
                 }
                 $icons['L'][] = '
 					<a href="#"
-						class="btn btn-default t3-btn-moveoption-up"
+						class="btn btn-default t3js-btn-moveoption-up"
 						data-fieldname="' . $fName . '"
 						title="' . htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_core.xlf:labels.move_up')) . '">
 						' . $this->iconFactory->getIcon('actions-move-up', Icon::SIZE_SMALL)->render() . '
 					</a>';
                 $icons['L'][] = '
 					<a href="#"
-						class="btn btn-default t3-btn-moveoption-down"
+						class="btn btn-default t3js-btn-moveoption-down"
 						data-fieldname="' . $fName . '"
 						title="' . htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_core.xlf:labels.move_down')) . '">
 						' . $this->iconFactory->getIcon('actions-move-down', Icon::SIZE_SMALL)->render() . '
@@ -614,7 +614,7 @@ abstract class AbstractFormElement extends AbstractNode
                 if ($sSize >= 5) {
                     $icons['L'][] = '
 						<a href="#"
-							class="btn btn-default t3-btn-moveoption-bottom"
+							class="btn btn-default t3js-btn-moveoption-bottom"
 							data-fieldname="' . $fName . '"
 							title="' . htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_core.xlf:labels.move_to_bottom')) . '">
 							' . $this->iconFactory->getIcon('actions-move-to-bottom', Icon::SIZE_SMALL)->render() . '
@@ -649,7 +649,7 @@ abstract class AbstractFormElement extends AbstractNode
         if (!$params['readOnly'] && !$params['noDelete']) {
             $icons['L'][] = '
 				<a href="#"
-					class="btn btn-default t3-btn-removeoption"
+					class="btn btn-default t3js-btn-removeoption"
 					onClick="' . $rOnClickInline . '"
 					data-fieldname="' . $fName . '"
 					title="' . htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_core.xlf:labels.remove_selected')) . '">
diff --git a/typo3/sysext/backend/Resources/Public/JavaScript/FormEngine.js b/typo3/sysext/backend/Resources/Public/JavaScript/FormEngine.js
index 6f2ad5e677a04167b50291587c9b13f4c5ee8e9e..6e9e1c5ccccfb7e6defeb76f9bd9e0b8e524aa51 100644
--- a/typo3/sysext/backend/Resources/Public/JavaScript/FormEngine.js
+++ b/typo3/sysext/backend/Resources/Public/JavaScript/FormEngine.js
@@ -569,7 +569,9 @@ define(['jquery',
 		$(document).on('change', 'input,textarea,select', function() {
 			// Keep track of input fields to set the dirty state
 			FormEngine.isDirty = $(document).find('.has-change').length > 0;
-		}).on('click', '.t3-btn-moveoption-top, .t3-btn-moveoption-up, .t3-btn-moveoption-down, .t3-btn-moveoption-bottom, .t3-btn-removeoption', function(evt) {
+		}).on('click', '.t3js-btn-moveoption-top, .t3js-btn-moveoption-up, .t3js-btn-moveoption-down, .t3js-btn-moveoption-bottom, .t3js-btn-removeoption', function(evt) {
+			evt.preventDefault();
+
 			// track the arrows "Up", "Down", "Clear" etc in multi-select boxes
 			var $el = $(this)
 					,fieldName = $el.data('fieldname')
@@ -577,15 +579,15 @@ define(['jquery',
 
 			if ($listFieldEl.length > 0) {
 
-				if ($el.hasClass('t3-btn-moveoption-top')) {
+				if ($el.hasClass('t3js-btn-moveoption-top')) {
 					FormEngine.moveOptionToTop($listFieldEl);
-				} else if ($el.hasClass('t3-btn-moveoption-up')) {
+				} else if ($el.hasClass('t3js-btn-moveoption-up')) {
 					FormEngine.moveOptionUp($listFieldEl);
-				} else if ($el.hasClass('t3-btn-moveoption-down')) {
+				} else if ($el.hasClass('t3js-btn-moveoption-down')) {
 					FormEngine.moveOptionDown($listFieldEl);
-				} else if ($el.hasClass('t3-btn-moveoption-bottom')) {
+				} else if ($el.hasClass('t3js-btn-moveoption-bottom')) {
 					FormEngine.moveOptionToBottom($listFieldEl);
-				} else if ($el.hasClass('t3-btn-removeoption')) {
+				} else if ($el.hasClass('t3js-btn-removeoption')) {
 					FormEngine.removeOption($listFieldEl);
 				}