diff --git a/README.md b/README.md
index 577ece1..f92644c 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 **Looking for a co-maintainer for Marionette**. If interested just respond in the issue titled "Looking for a co-maintainer".
 
-![GitHub Workflow Status](https://img.shields.io/github/workflow/status/watzon/marionette/specs?style=flat-square)  ![License](https://img.shields.io/github/license/watzon/marionette?style=flat-square)  ![Crystal Version](https://img.shields.io/badge/Crystal-1.0.0-%23333333?style=flat-square)
+![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/watzon/marionette/specs.yml?branch=master&style=flat-square)  ![License](https://img.shields.io/github/license/watzon/marionette?style=flat-square)  ![Crystal Version](https://img.shields.io/badge/Crystal-1.0.0-%23333333?style=flat-square)
 
 <div align="center">
   <img src="./assets/code.png">
diff --git a/src/marionette/service.cr b/src/marionette/service.cr
index 863cbc0..a3f8a44 100644
--- a/src/marionette/service.cr
+++ b/src/marionette/service.cr
@@ -62,7 +62,7 @@ module Marionette
         HTTP::Client.get(File.join(url.to_s, "shutdown"))
         0.upto(30).each do
           if open?
-            sleep 1000
+            sleep 1
           else
             break
           end
@@ -84,7 +84,11 @@ module Marionette
 
     def stop
       if process = @process
-        send_remote_shutdown
+        # geckodriver does not support remote shutdown, so don't try
+        # and wait for it to close gracefully.
+        unless @browser.is_a?(Browser::Firefox)
+          send_remote_shutdown
+        end
 
         begin
           process.signal(Signal::INT)