diff --git a/res/css/views/rooms/_RoomSublist2.scss b/res/css/views/rooms/_RoomSublist2.scss
index 749e0451cd..0e76152f86 100644
--- a/res/css/views/rooms/_RoomSublist2.scss
+++ b/res/css/views/rooms/_RoomSublist2.scss
@@ -92,7 +92,7 @@ limitations under the License.
 
             // Apply the width and margin to the badge so the container doesn't occupy dead space
             .mx_NotificationBadge {
-                width: 16px;
+                // Do not set a width so the badges get properly sized
                 margin-left: 8px; // same as menu+aux buttons
             }
         }
diff --git a/res/css/views/rooms/_RoomTile2.scss b/res/css/views/rooms/_RoomTile2.scss
index 1fd32d3555..7b606ab947 100644
--- a/res/css/views/rooms/_RoomTile2.scss
+++ b/res/css/views/rooms/_RoomTile2.scss
@@ -85,6 +85,7 @@ limitations under the License.
         height: 16px;
         // don't set width so that it takes no space when there is no badge to show
         margin: auto 0; // vertically align
+        position: relative; // fixes badge alignment in some scenarios
 
         // Create a flexbox to make aligning dot badges easier
         display: flex;