diff --git a/Session/Conversations/Settings/ThreadDisappearingMessagesViewModel.swift b/Session/Conversations/Settings/ThreadDisappearingMessagesViewModel.swift
index 7e2901cd8..b13a890a2 100644
--- a/Session/Conversations/Settings/ThreadDisappearingMessagesViewModel.swift
+++ b/Session/Conversations/Settings/ThreadDisappearingMessagesViewModel.swift
@@ -79,6 +79,7 @@ class ThreadDisappearingMessagesViewModel: SessionTableViewModel<ThreadDisappear
                     style: .bordered,
                     title: "DISAPPERING_MESSAGES_SAVE_TITLE".localized(),
                     isEnabled: true,
+                    minWidth: 110,
                     onTap: {
                         self?.saveChanges()
                         self?.dismissScreen()
diff --git a/Session/Shared/SessionTableViewController.swift b/Session/Shared/SessionTableViewController.swift
index 24b6cd82d..ed0f09984 100644
--- a/Session/Shared/SessionTableViewController.swift
+++ b/Session/Shared/SessionTableViewController.swift
@@ -298,6 +298,7 @@ class SessionTableViewController<NavItemId: Equatable, Section: SessionTableSect
                     self?.footerButton.setTitle(buttonInfo.title, for: .normal)
                     self?.footerButton.setStyle(buttonInfo.style)
                     self?.footerButton.isEnabled = buttonInfo.isEnabled
+                    self?.footerButton.set(.width, greaterThanOrEqualTo: buttonInfo.minWidth)
                 }
                 
                 self?.onFooterTap = buttonInfo?.onTap
diff --git a/SessionUIKit/Components/SessionButton.swift b/SessionUIKit/Components/SessionButton.swift
index f7acab456..fd1c63fd2 100644
--- a/SessionUIKit/Components/SessionButton.swift
+++ b/SessionUIKit/Components/SessionButton.swift
@@ -21,18 +21,21 @@ public final class SessionButton: UIButton {
         public let style: Style
         public let title: String
         public let isEnabled: Bool
+        public let minWidth: CGFloat
         public let onTap: () -> ()
         
         public init(
             style: Style,
             title: String,
             isEnabled: Bool,
+            minWidth: CGFloat = 0,
             onTap: @escaping () -> ()
         ) {
             self.style = style
             self.title = title
             self.isEnabled = isEnabled
             self.onTap = onTap
+            self.minWidth = minWidth
         }
     }