diff --git a/Resources/Scripts/code.js b/Resources/Scripts/code.js
index 1ec31fd6..f8738fe0 100644
--- a/Resources/Scripts/code.js
+++ b/Resources/Scripts/code.js
@@ -1278,6 +1278,15 @@
     };
   }
   
+  //
+  // Block: Remove column mouse wheel handler, which allows smooth scrolling inside columns, and horizontally scrolling column container when holding Shift.
+  //
+  if (ensurePropertyExists(TD, "ui", "columns", "setupColumn")){
+    TD.ui.columns.setupColumn = appendToFunction(TD.ui.columns.setupColumn, function(e){
+      $(".js-column[data-column='"+e.model.getKey()+"']").off("mousewheel onmousewheel");
+    });
+  }
+  
   //
   // Block: Detect and notify about connection issues.
   //