diff --git a/js/sql.js b/js/sql.js
index 7c2b573988..d50bfe53c4 100644
--- a/js/sql.js
+++ b/js/sql.js
@@ -411,25 +411,6 @@ AJAX.registerOnload('sql.js', function () {
         });
     });
 
-    /*
-     * Attach a custom event for sticky column headings which will be
-     * triggered manually everytime the table of results is reloaded
-     * @memberOf    jQuery
-     */
-    $(document).on('stickycolumns', '.sqlqueryresults', function () {
-        $('.sticky_columns').remove();
-        $('.table_results').each(function () {
-            var $tableResults = $(this);
-            // add sticky columns div
-            var $stickColumns = Sql.initStickyColumns($tableResults);
-            Sql.rearrangeStickyColumns($stickColumns, $tableResults);
-            // adjust sticky columns on scroll
-            $(document).on('scroll', window, function () {
-                Sql.handleStickyColumns($stickColumns, $tableResults);
-            });
-        });
-    });
-
     /**
      * Append the "Show/Hide query box" message to the query input form
      *
@@ -657,7 +638,7 @@ AJAX.registerOnload('sql.js', function () {
                     });
                 }
 
-                $('.sqlqueryresults').trigger('makegrid').trigger('stickycolumns');
+                $('.sqlqueryresults').trigger('makegrid');
                 $('#togglequerybox').show();
                 Functions.initSlider();
 
@@ -696,8 +677,7 @@ AJAX.registerOnload('sql.js', function () {
             var $sqlqueryresults = $form.parents('.sqlqueryresults');
             $sqlqueryresults
                 .html(data.message)
-                .trigger('makegrid')
-                .trigger('stickycolumns');
+                .trigger('makegrid');
             Functions.initSlider();
             Functions.highlightSql($sqlqueryresults);
         }); // end $.post()
@@ -980,7 +960,7 @@ AJAX.registerOnload('sql.js', function () {
     /**
      * create resizable table
      */
-    $('.sqlqueryresults').trigger('makegrid').trigger('stickycolumns');
+    $('.sqlqueryresults').trigger('makegrid');
 
     /**
      * Check if there is any saved query
@@ -1054,88 +1034,15 @@ Sql.initProfilingTables = function () {
     });
 };
 
-/**
- * Set position, left, top, width of sticky_columns div
- */
-Sql.setStickyColumnsPosition = function ($stickyColumns, $tableResults, position, top, left, marginLeft) {
-    $stickyColumns
-        .css('position', position)
-        .css('top', top)
-        .css('left', left ? left : 'auto')
-        .css('margin-left', marginLeft ? marginLeft : '0px')
-        .css('width', $tableResults.width());
-};
-
-/**
- * Initialize sticky columns
- */
-Sql.initStickyColumns = function ($tableResults) {
-    return $('<table class="sticky_columns"></table>')
-        .insertBefore($tableResults)
-        .css('position', 'fixed')
-        .css('z-index', '98')
-        .css('width', $tableResults.width())
-        .css('margin-left', $('#page_content').css('margin-left'))
-        .css('top', $('#floating_menubar').height())
-        .css('display', 'none');
-};
-
-/**
- * Arrange/Rearrange columns in sticky header
- */
-Sql.rearrangeStickyColumns = function ($stickyColumns, $tableResults) {
-    var $originalHeader = $tableResults.find('thead');
-    var $originalColumns = $originalHeader.find('tr:first').children();
-    var $clonedHeader = $originalHeader.clone();
-    var isFirefox = navigator.userAgent.indexOf('Firefox') > -1;
-    var isSafari = navigator.userAgent.indexOf('Safari') > -1;
-    // clone width per cell
-    $clonedHeader.find('tr:first').children().each(function (i) {
-        var width = $originalColumns.eq(i).width();
-        if (! isFirefox && ! isSafari) {
-            width += 1;
-        }
-        $(this).width(width);
-        if (isSafari) {
-            $(this).css('min-width', width).css('max-width', width);
-        }
-    });
-    $stickyColumns.empty().append($clonedHeader);
-};
-
-/**
- * Adjust sticky columns on horizontal/vertical scroll for all tables
- */
-Sql.handleAllStickyColumns = function () {
-    $('.sticky_columns').each(function () {
-        Sql.handleStickyColumns($(this), $(this).next('.table_results'));
-    });
-};
-
-/**
- * Adjust sticky columns on horizontal/vertical scroll
- */
-Sql.handleStickyColumns = function ($stickyColumns, $tableResults) {
-    var currentScrollX = $(window).scrollLeft();
-    var windowOffset = $(window).scrollTop();
-    var tableStartOffset = $tableResults.offset().top;
-    var tableEndOffset = tableStartOffset + $tableResults.height();
-    if (windowOffset >= tableStartOffset && windowOffset <= tableEndOffset) {
-        // for horizontal scrolling
-        if (prevScrollX !== currentScrollX) {
-            prevScrollX = currentScrollX;
-            Sql.setStickyColumnsPosition($stickyColumns, $tableResults, 'absolute', $('#floating_menubar').height() + windowOffset - tableStartOffset);
-        // for vertical scrolling
-        } else {
-            Sql.setStickyColumnsPosition($stickyColumns, $tableResults, 'fixed', $('#floating_menubar').height(), $('#pma_navigation').width() - currentScrollX, $('#page_content').css('margin-left'));
-        }
-        $stickyColumns.show();
-    } else {
-        $stickyColumns.hide();
-    }
-};
-
 AJAX.registerOnload('sql.js', function () {
     Sql.makeProfilingChart();
     Sql.initProfilingTables();
 });
+
+
+/**
+ * Polyfill to make table headers sticky.
+ */
+ 
+var elements = $('.sticky');
+Stickyfill.add(elements);
diff --git a/js/vendor/stickyfill.min.js b/js/vendor/stickyfill.min.js
new file mode 100644
index 0000000000..6da138d188
--- /dev/null
+++ b/js/vendor/stickyfill.min.js
@@ -0,0 +1,6 @@
+/*!
+  * Stickyfill – `position: sticky` polyfill
+  * v. 2.1.0 | https://github.com/wilddeer/stickyfill
+  * MIT License
+  */
+!function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}function d(a,b){for(var c in b)b.hasOwnProperty(c)&&(a[c]=b[c])}function e(a){return parseFloat(a)||0}function f(a){for(var b=0;a;)b+=a.offsetTop,a=a.offsetParent;return b}function g(){function c(){a.pageXOffset!=m.left?(m.top=a.pageYOffset,m.left=a.pageXOffset,p.refreshAll()):a.pageYOffset!=m.top&&(m.top=a.pageYOffset,m.left=a.pageXOffset,n.forEach(function(a){return a._recalcPosition()}))}function d(){f=setInterval(function(){n.forEach(function(a){return a._fastCheck()})},500)}function e(){clearInterval(f)}if(!k){k=!0,c(),a.addEventListener("scroll",c),a.addEventListener("resize",p.refreshAll),a.addEventListener("orientationchange",p.refreshAll);var f=void 0,g=void 0,h=void 0;"hidden"in b?(g="hidden",h="visibilitychange"):"webkitHidden"in b&&(g="webkitHidden",h="webkitvisibilitychange"),h?(b[g]||d(),b.addEventListener(h,function(){b[g]?e():d()})):d()}}var h=function(){function a(a,b){for(var c=0;c<b.length;c++){var d=b[c];d.enumerable=d.enumerable||!1,d.configurable=!0,"value"in d&&(d.writable=!0),Object.defineProperty(a,d.key,d)}}return function(b,c,d){return c&&a(b.prototype,c),d&&a(b,d),b}}(),i=!1,j="undefined"!=typeof a;j&&a.getComputedStyle?!function(){var a=b.createElement("div");["","-webkit-","-moz-","-ms-"].some(function(b){try{a.style.position=b+"sticky"}catch(a){}return""!=a.style.position})&&(i=!0)}():i=!0;var k=!1,l="undefined"!=typeof ShadowRoot,m={top:null,left:null},n=[],o=function(){function g(a){if(c(this,g),!(a instanceof HTMLElement))throw new Error("First argument must be HTMLElement");if(n.some(function(b){return b._node===a}))throw new Error("Stickyfill is already applied to this node");this._node=a,this._stickyMode=null,this._active=!1,n.push(this),this.refresh()}return h(g,[{key:"refresh",value:function(){if(!i&&!this._removed){this._active&&this._deactivate();var c=this._node,g=getComputedStyle(c),h={position:g.position,top:g.top,display:g.display,marginTop:g.marginTop,marginBottom:g.marginBottom,marginLeft:g.marginLeft,marginRight:g.marginRight,cssFloat:g.cssFloat};if(!isNaN(parseFloat(h.top))&&"table-cell"!=h.display&&"none"!=h.display){this._active=!0;var j=c.style.position;"sticky"!=g.position&&"-webkit-sticky"!=g.position||(c.style.position="static");var k=c.parentNode,m=l&&k instanceof ShadowRoot?k.host:k,n=c.getBoundingClientRect(),o=m.getBoundingClientRect(),p=getComputedStyle(m);this._parent={node:m,styles:{position:m.style.position},offsetHeight:m.offsetHeight},this._offsetToWindow={left:n.left,right:b.documentElement.clientWidth-n.right},this._offsetToParent={top:n.top-o.top-e(p.borderTopWidth),left:n.left-o.left-e(p.borderLeftWidth),right:-n.right+o.right-e(p.borderRightWidth)},this._styles={position:j,top:c.style.top,bottom:c.style.bottom,left:c.style.left,right:c.style.right,width:c.style.width,marginTop:c.style.marginTop,marginLeft:c.style.marginLeft,marginRight:c.style.marginRight};var q=e(h.top);this._limits={start:n.top+a.pageYOffset-q,end:o.top+a.pageYOffset+m.offsetHeight-e(p.borderBottomWidth)-c.offsetHeight-q-e(h.marginBottom)};var r=p.position;"absolute"!=r&&"relative"!=r&&(m.style.position="relative"),this._recalcPosition();var s=this._clone={};s.node=b.createElement("div"),d(s.node.style,{width:n.right-n.left+"px",height:n.bottom-n.top+"px",marginTop:h.marginTop,marginBottom:h.marginBottom,marginLeft:h.marginLeft,marginRight:h.marginRight,cssFloat:h.cssFloat,padding:0,border:0,borderSpacing:0,fontSize:"1em",position:"static"}),k.insertBefore(s.node,c),s.docOffsetTop=f(s.node)}}}},{key:"_recalcPosition",value:function(){if(this._active&&!this._removed){var a=m.top<=this._limits.start?"start":m.top>=this._limits.end?"end":"middle";if(this._stickyMode!=a){switch(a){case"start":d(this._node.style,{position:"absolute",left:this._offsetToParent.left+"px",right:this._offsetToParent.right+"px",top:this._offsetToParent.top+"px",bottom:"auto",width:"auto",marginLeft:0,marginRight:0,marginTop:0});break;case"middle":d(this._node.style,{position:"fixed",left:this._offsetToWindow.left+"px",right:this._offsetToWindow.right+"px",top:this._styles.top,bottom:"auto",width:"auto",marginLeft:0,marginRight:0,marginTop:0});break;case"end":d(this._node.style,{position:"absolute",left:this._offsetToParent.left+"px",right:this._offsetToParent.right+"px",top:"auto",bottom:0,width:"auto",marginLeft:0,marginRight:0})}this._stickyMode=a}}}},{key:"_fastCheck",value:function(){this._active&&!this._removed&&(Math.abs(f(this._clone.node)-this._clone.docOffsetTop)>1||Math.abs(this._parent.node.offsetHeight-this._parent.offsetHeight)>1)&&this.refresh()}},{key:"_deactivate",value:function(){var a=this;this._active&&!this._removed&&(this._clone.node.parentNode.removeChild(this._clone.node),delete this._clone,d(this._node.style,this._styles),delete this._styles,n.some(function(b){return b!==a&&b._parent&&b._parent.node===a._parent.node})||d(this._parent.node.style,this._parent.styles),delete this._parent,this._stickyMode=null,this._active=!1,delete this._offsetToWindow,delete this._offsetToParent,delete this._limits)}},{key:"remove",value:function(){var a=this;this._deactivate(),n.some(function(b,c){if(b._node===a._node)return n.splice(c,1),!0}),this._removed=!0}}]),g}(),p={stickies:n,Sticky:o,forceSticky:function(){i=!1,g(),this.refreshAll()},addOne:function(a){if(!(a instanceof HTMLElement)){if(!a.length||!a[0])return;a=a[0]}for(var b=0;b<n.length;b++)if(n[b]._node===a)return n[b];return new o(a)},add:function(a){if(a instanceof HTMLElement&&(a=[a]),a.length){for(var b=[],c=function(c){var d=a[c];return d instanceof HTMLElement?n.some(function(a){if(a._node===d)return b.push(a),!0})?"continue":void b.push(new o(d)):(b.push(void 0),"continue")},d=0;d<a.length;d++){c(d)}return b}},refreshAll:function(){n.forEach(function(a){return a.refresh()})},removeOne:function(a){if(!(a instanceof HTMLElement)){if(!a.length||!a[0])return;a=a[0]}n.some(function(b){if(b._node===a)return b.remove(),!0})},remove:function(a){if(a instanceof HTMLElement&&(a=[a]),a.length)for(var b=function(b){var c=a[b];n.some(function(a){if(a._node===c)return a.remove(),!0})},c=0;c<a.length;c++)b(c)},removeAll:function(){for(;n.length;)n[0].remove()}};i||g(),"undefined"!=typeof module&&module.exports?module.exports=p:j&&(a.Stickyfill=p)}(window,document);
\ No newline at end of file
diff --git a/libraries/classes/Display/Results.php b/libraries/classes/Display/Results.php
index 9d2f2bec44..8ea7fad15c 100644
--- a/libraries/classes/Display/Results.php
+++ b/libraries/classes/Display/Results.php
@@ -1420,7 +1420,7 @@ class Results
 
             $display_params['emptypre'] = $emptyPreCondition ? 4 : 0;
 
-            $button_html .= '<th class="column_action print_ignore" ' . $colspan
+            $button_html .= '<th class="column_action sticky print_ignore" ' . $colspan
                 . '>' . $full_or_partial_text_link . '</th>';
         } elseif ($leftOrBoth
             && (($displayParts['edit_lnk'] != self::NO_EDIT_OR_DELETE)
@@ -1434,7 +1434,7 @@ class Results
         } elseif ($GLOBALS['cfg']['RowActionLinks'] == self::POSITION_NONE) {
             // ... elseif display an empty column if the actions links are
             //  disabled to match the rest of the table
-            $button_html .= '<th class="column_action"></th>';
+            $button_html .= '<th class="column_action sticky"></th>';
         }
 
         $this->__set('display_params', $display_params);
@@ -2127,6 +2127,7 @@ class Results
         }
 
         $th_class[] = 'column_heading';
+        $th_class[] = 'sticky';
         if ($GLOBALS['cfg']['BrowsePointerEnable'] == true) {
             $th_class[] = 'pointer';
         }
@@ -2170,6 +2171,7 @@ class Results
         $draggable_html = '<th';
         $th_class = [];
         $th_class[] = 'draggable';
+        $th_class[] = 'sticky';
         $this->_getClassForNumericColumnType($fields_meta, $th_class);
         if ($col_visib && ! $col_visib_j) {
             $th_class[] = 'hide';
diff --git a/sql.php b/sql.php
index 46c386567c..3da6a51e7b 100644
--- a/sql.php
+++ b/sql.php
@@ -44,6 +44,7 @@ $scripts = $header->getScripts();
 $scripts->addFile('vendor/jquery/jquery.uitablefilter.js');
 $scripts->addFile('table/change.js');
 $scripts->addFile('indexes.js');
+$scripts->addFile('vendor/stickyfill.min.js');
 $scripts->addFile('gis_data_editor.js');
 $scripts->addFile('multi_column_sort.js');
 
diff --git a/themes/metro/scss/_common.scss b/themes/metro/scss/_common.scss
index 64b1c0dd62..de4adfb1a0 100644
--- a/themes/metro/scss/_common.scss
+++ b/themes/metro/scss/_common.scss
@@ -3118,14 +3118,19 @@ form.append_fields_form .tblFooters {
   border-#{$right}: 2px solid #a44;
 }
 
-.pma_table,
-.sticky_columns {
+.pma_table {
   th.draggable span {
     display: block;
     overflow: hidden;
   }
 }
 
+.sticky {
+    position: -webkit-sticky;
+    position: sticky;
+    top: 60px;
+}
+
 .pma_table {
   td {
     position: static;
diff --git a/themes/original/scss/_common.scss b/themes/original/scss/_common.scss
index 401525d9af..fbbc3809ca 100644
--- a/themes/original/scss/_common.scss
+++ b/themes/original/scss/_common.scss
@@ -2484,14 +2484,19 @@ input#auto_increment_opt {
   border-#{$right}: 2px solid #a44;
 }
 
-.pma_table,
-.sticky_columns {
+.pma_table {
   th.draggable span {
     display: block;
     overflow: hidden;
   }
 }
 
+.sticky {
+    position: -webkit-sticky;
+    position: sticky;
+    top: 60px;
+}
+
 .pma_table {
   td {
     position: static;
diff --git a/themes/pmahomme/scss/_common.scss b/themes/pmahomme/scss/_common.scss
index 8bf241b0bb..0aa3aefa7e 100644
--- a/themes/pmahomme/scss/_common.scss
+++ b/themes/pmahomme/scss/_common.scss
@@ -2972,14 +2972,19 @@ input#auto_increment_opt {
   border-#{$right}: 2px solid #a44;
 }
 
-.pma_table,
-.sticky_columns {
+.pma_table {
   th.draggable span {
     display: block;
     overflow: hidden;
   }
 }
 
+.sticky {
+    position: -webkit-sticky;
+    position: sticky;
+    top: 60px;
+}
+
 .pma_table {
   td {
     position: static;