diff --git a/src/main.js b/src/main.js
index 9c3ec60f..e19584d0 100644
--- a/src/main.js
+++ b/src/main.js
@@ -149,7 +149,7 @@ ${typeof x[1] === 'string' ? x[1] : JSON.stringify(x[1], null, 4)}`
 FrankerFaceZ.Logger = Logger;
 
 const VER = FrankerFaceZ.version_info = {
-	major: 4, minor: 0, revision: 0, extra: '-rc21',
+	major: 4, minor: 0, revision: 0, extra: '-rc21.1',
 	commit: __git_commit__,
 	build: __webpack_hash__,
 	toString: () =>
diff --git a/src/modules/chat/actions/index.jsx b/src/modules/chat/actions/index.jsx
index e329cf99..d93794b4 100644
--- a/src/modules/chat/actions/index.jsx
+++ b/src/modules/chat/actions/index.jsx
@@ -494,22 +494,26 @@ export default class Actions extends Module {
 				type: msg.user.type
 			});*/
 
-		let out = (<div
-			class="ffz--inline-actions ffz-action-data tw-inline-block tw-mg-r-05"
-			data-source="line"
-		>
-			{actions}
-		</div>);
+		let out = null;
+		if ( actions.length )
+			out = (<div
+				class="ffz--inline-actions ffz-action-data tw-inline-block tw-mg-r-05"
+				data-source="line"
+			>
+				{actions}
+			</div>);
 
 		if ( modified.length ) {
-			return [out,
-				(<div
-					class="ffz--inline-actions ffz--modifier-actions ffz-action-data"
-					data-source="line"
-				>
-					{modified}
-				</div>)
-			];
+			const modified_out = (<div
+				class="ffz--inline-actions ffz--modifier-actions ffz-action-data"
+				data-source="line"
+			>
+				{modified}
+			</div>);
+
+			if ( out )
+				return [out, modified_out];
+			return modified_out;
 		}
 
 		return out;
diff --git a/styles/chat.scss b/styles/chat.scss
index 5e8344f7..9d4c18f2 100644
--- a/styles/chat.scss
+++ b/styles/chat.scss
@@ -63,6 +63,7 @@
 	top: 0;
 	left: 0;
 	padding: .5rem 0;
+	z-index: 1;
 
 	background: rgba(255,255,255,0.5);