diff --git a/js/formidable_admin.js b/js/formidable_admin.js
index ced22ca6c9..34c57763d8 100644
--- a/js/formidable_admin.js
+++ b/js/formidable_admin.js
@@ -4411,9 +4411,6 @@ function frmAdminBuildJS() {
 						}
 					}
 				);
-
-				// when holding shift and clicking, text gets selected. unselect it.
-				document.getSelection().removeAllRanges();
 			}
 		} else {
 			// not multi-selecting
@@ -10706,6 +10703,11 @@ function frmAdminBuildJS() {
 			handleShowPasswordLiveUpdate();
 			document.addEventListener( 'scroll', updateShortcodesPopupPosition, true );
 			document.addEventListener( 'change', handleBuilderChangeEvent );
+			document.querySelector( '.frm_form_builder' ).addEventListener( 'mousedown', event => {
+				if ( event.shiftKey ) {
+				  event.preventDefault();
+				}
+			});
 		},
 
 		settingsInit: function() {