diff --git a/changelog.html b/changelog.html
index 26b0655f..dbbe895f 100644
--- a/changelog.html
+++ b/changelog.html
@@ -1,3 +1,8 @@
+<div class="list-header">4.0.0-beta1.5<span>@68369664d8835665997c</span> <time datetime="2018-01-15">(2018-01-15)</time></div>
+<ul class="chat-menu-content menu-side-padding">
+	<li>Fixed: Chat Freeze breaking due to Twitch moving the <code>scrollToBottom</code> function out of the prototype and defining it on the chat pane during construction.</li>
+</ul>
+
 <div class="list-header">4.0.0-beta1.5<span>@9a60ce1ee6c58905c6eb</span> <time datetime="2017-12-13">(2017-12-13)</time></div>
 <ul class="chat-menu-content menu-side-padding">
 	<li>Fixed: Player not covering the whole window in theater mode with a custom chat width and chat collapsed.</li>
diff --git a/src/sites/twitch-twilight/modules/chat/scroller.js b/src/sites/twitch-twilight/modules/chat/scroller.js
index 069e10bd..e5f21945 100644
--- a/src/sites/twitch-twilight/modules/chat/scroller.js
+++ b/src/sites/twitch-twilight/modules/chat/scroller.js
@@ -62,13 +62,7 @@ export default class Scroller extends Module {
 		});
 
 		this.ChatScroller.ready((cls, instances) => {
-			const t = this,
-				old_scroll = cls.prototype.scrollToBottom;
-
-			cls.prototype.scrollToBottom = function() {
-				if ( ! this.ffz_freeze_enabled || ! this.state.ffzFrozen )
-					return old_scroll.call(this);
-			}
+			const t = this;
 
 			cls.prototype.ffzShouldBeFrozen = function(since) {
 				if ( since === undefined )
@@ -175,8 +169,14 @@ export default class Scroller extends Module {
 				if ( this._ffz_handleScroll )
 					return;
 
-				this._ffz_handleScroll = this.handleScrollEvent;
 				const t = this;
+				this._old_scroll = this.scrollToBottom;
+				this.scrollToBottom = function() {
+					if ( ! this.ffz_freeze_enabled || ! this.state.ffzFrozen )
+						return this._old_scroll();
+				}
+
+				this._ffz_handleScroll = this.handleScrollEvent;
 				this.handleScrollEvent = function(e) {
 					// If we're frozen because of FFZ, do not allow a mouse click to update
 					// the auto-scrolling state. That just gets annoying.
diff --git a/src/sites/twitch-twilight/modules/css_tweaks/styles/chat-rows.scss b/src/sites/twitch-twilight/modules/css_tweaks/styles/chat-rows.scss
index 9aa7e236..0ecdad88 100644
--- a/src/sites/twitch-twilight/modules/css_tweaks/styles/chat-rows.scss
+++ b/src/sites/twitch-twilight/modules/css_tweaks/styles/chat-rows.scss
@@ -4,8 +4,10 @@
 
 .chat-line__moderation,
 .chat-line__status,
-.chat-line__raid,
+.chat-list__lines .chat-line__raid,
 .chat-list__lines .chat-line__subscribe,
+.chat-list__lines .chat-line__bits-charity,
+.chat-list__lines .chat-line__ritual,
 .chat-line__subscribe,
 .chat-line__message {
 	background-color: transparent !important;