diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java b/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
index bd86864c62..8d5e8f726c 100644
--- a/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
+++ b/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
@@ -345,6 +345,14 @@ public class ProxyControlGui extends LogicControllerGui implements JMeterGUIComp
     public void actionPerformed(ActionEvent action) {
         String command = action.getActionCommand();
 
+        // Prevent both redirect types from being selected
+        final Object source = action.getSource();
+        if (source.equals(samplerFollowRedirects) && samplerFollowRedirects.isSelected()) {
+            samplerRedirectAutomatically.setSelected(false);
+        } else if (source.equals(samplerRedirectAutomatically) && samplerRedirectAutomatically.isSelected()) {
+            samplerFollowRedirects.setSelected(false);            
+        }
+
         // System.err.println(action.paramString()+" "+command+ "
         // "+action.getModifiers());
 
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 509fde9400..c78c81ad54 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -276,6 +276,7 @@ Previously the default was 1, which could cause unexpected additional traffic.
 <li><bugzilla>55502</bugzilla> - Proxy generates empty http:/ entries when recording</li>
 <li><bugzilla>55504</bugzilla> - Proxy incorrectly issues CONNECT requests when browser prompts for certificate override</li>
 <li><bugzilla>55506</bugzilla> - Proxy should deliver failed requests to any configured Listeners</li>
+<li><bugzilla>55545</bugzilla> - HTTP Proxy Server GUI should not allow both Follow and Auto redirect to be selected</li>
 </ul>
 
 <h3>Other Samplers</h3>