         buttonContainer.snp.makeConstraints { make in
             make.top.bottom.equalTo(urlTextContainer)
 
-            make.width.greaterThanOrEqualTo(deleteButton).inset(-UIConstants.layout.urlBarMargin).priority(999)
-            make.width.greaterThanOrEqualTo(cancelButton).inset(-UIConstants.layout.urlBarMargin).priority(999)
-            make.width.greaterThanOrEqualTo(toolset.backButton).priority(999)
-
-            // This will shrink the container to be as small as possible.
+            make.width.greaterThanOrEqualTo(deleteButton).inset(-UIConstants.layout.urlBarMargin).priority(998)
+            make.width.greaterThanOrEqualTo(cancelButton).inset(-UIConstants.layout.urlBarMargin).priority(998)
+            make.width.greaterThanOrEqualTo(toolset.backButton).priority(998)
+
+            // This will shrink the container to be as small as possible while still meeting the width requirements above.
             make.width.equalTo(0).priority(500)
 
             // Keep the button container hidden until we start browsing.
-            hideButtonContainerConstraint = make.width.equalTo(UIConstants.layout.urlBarMargin).constraint
+            // Set the width equal to the URL bar margin so there's still a gap between the trailing edges...
+            hideButtonContainerConstraint = make.width.equalTo(UIConstants.layout.urlBarMargin).priority(999).constraint
+
+            /// ...unless we're showing the Settings button.
+            showSettingsConstraints.append(make.width.equalTo(0).constraint)
         }
 
         toolset.sendButton.snp.makeConstraints { make in


    private var hideButtonContainerConstraint: Constraint!
    private var fullWidthURLTextConstraint: Constraint!
    private var hideLockConstraints = [Constraint]()
    private var hideToolsetConstraints = [Constraint]()
    private var showToolsetConstraints = [Constraint]()

        }

        showToolsetConstraints.forEach { $0.deactivate() }
        showSettingsConstraints.forEach { $0.deactivate() }
    }

    required init?(coder aDecoder: NSCoder) {
