diff --git a/lib/persistent_selenium/cli.rb b/lib/persistent_selenium/cli.rb
index f305424..9723580 100644
--- a/lib/persistent_selenium/cli.rb
+++ b/lib/persistent_selenium/cli.rb
@@ -27,6 +27,9 @@ module PersistentSelenium
 
       DRb.start_service PersistentSelenium.url, @browser
 
+      trap('TERM') { exit }
+      trap('INT') { exit }
+
       DRb.thread.join
     end