diff --git a/CHANGELOG.md b/CHANGELOG.md
index 871958237..a516571e1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## Unversioned
 
 - Minor: Added `/openurl` command. Usage: `/openurl <URL>`. Opens the provided URL in the browser. (#2461, #2926)
+- Bugfix: Fixed large timeout durations in moderation buttons overlapping with usernames or other buttons. (#2865, #2921)
 
 ## 2.3.3
 
diff --git a/src/controllers/moderationactions/ModerationAction.cpp b/src/controllers/moderationactions/ModerationAction.cpp
index 467f9db5c..a24ce9e85 100644
--- a/src/controllers/moderationactions/ModerationAction.cpp
+++ b/src/controllers/moderationactions/ModerationAction.cpp
@@ -86,7 +86,15 @@ ModerationAction::ModerationAction(const QString &action)
         }
         else
         {
-            this->line1_ = QString::number(amount / week);
+            // limit to max timeout duration
+            if (amount > 2 * week)
+            {
+                this->line1_ = ">2";
+            }
+            else
+            {
+                this->line1_ = QString::number(amount / week);
+            }
             this->line2_ = "w";
         }