diff --git a/lib/swift b/lib/swift
index 5d4d4ef506..b8bc1b66e7 100644
--- a/lib/swift
+++ b/lib/swift
@@ -687,6 +687,11 @@ function stop_swift {
         swift-init --run-dir=${SWIFT_DATA_DIR}/run all stop || true
     fi
     # Dump all of the servers
+    # Maintain the iteration as screen_stop() has some desirable side-effects
+    for type in proxy object container account; do
+        screen_stop s-${type}
+    done
+    # Blast out any stragglers
     pkill -f swift-
 }