diff --git a/src/contentScripts/communityConsole/dragAndDropFix.js b/src/contentScripts/communityConsole/dragAndDropFix.js
index 1f293f6..d2b93d0 100644
--- a/src/contentScripts/communityConsole/dragAndDropFix.js
+++ b/src/contentScripts/communityConsole/dragAndDropFix.js
@@ -1,3 +1,5 @@
+import {isOptionEnabled} from '../../common/optionsUtils.js';
+
 export function applyDragAndDropFix(node) {
   console.debug('Adding link drag&drop fix to ', node);
   node.addEventListener('drop', e => {
@@ -7,3 +9,9 @@
     }
   }, true);
 }
+
+export function applyDragAndDropFixIfEnabled(node) {
+  isOptionEnabled('ccdragndropfix').then(isEnabled => {
+    if (isEnabled) applyDragAndDropFix(node);
+  });
+}