diff --git a/src/UI/Shared/Grid/HeaderCell.js b/src/UI/Shared/Grid/HeaderCell.js
index 12fa6be20..1e821557b 100644
--- a/src/UI/Shared/Grid/HeaderCell.js
+++ b/src/UI/Shared/Grid/HeaderCell.js
@@ -1,4 +1,6 @@
-module.exports.register = function(backgrid) {
+module.exports = function() {
+    var backgrid = this;
+
     backgrid.SonarrHeaderCell = backgrid.HeaderCell.extend({
         events                  : {
             'click' : 'onClick'
@@ -109,4 +111,6 @@ module.exports.register = function(backgrid) {
             this.$el.children('i').removeClass('icon-sort-up icon-sort-down');
         }
     });
+
+    return backgrid.SonarrHeaderCell;
 };
diff --git a/src/UI/Shims/backgrid.js b/src/UI/Shims/backgrid.js
index 44c666a13..0292b5264 100644
--- a/src/UI/Shims/backgrid.js
+++ b/src/UI/Shims/backgrid.js
@@ -1,12 +1,9 @@
-require('../JsLibraries/backbone.backgrid');
-require('backbone');
-
 require('backbone');
 
 var backgrid = require('../JsLibraries/backbone.backgrid');
 var header = require('../Shared/Grid/HeaderCell');
 
-header.register(backgrid);
+header.call(backgrid);
 
 backgrid.Column.prototype.defaults = {
     name       : undefined,
diff --git a/src/UI/Shims/backgrid.paginator.js b/src/UI/Shims/backgrid.paginator.js
index 38bdf1c68..874fb4006 100644
--- a/src/UI/Shims/backgrid.paginator.js
+++ b/src/UI/Shims/backgrid.paginator.js
@@ -1,8 +1,5 @@
-require('backgrid');
-require('backbone');
-require('../JsLibraries/backbone.backgrid.paginator');
-
 require('backbone');
 var backgrid = require('backgrid');
 require('../JsLibraries/backbone.backgrid.paginator');
+
 module.exports = backgrid.Extension.Paginator;
\ No newline at end of file