diff --git a/src/button.h b/src/button.h
index 01b9106..ec09379 100644
--- a/src/button.h
+++ b/src/button.h
@@ -54,6 +54,11 @@ struct Button : Widget {
     auto set_auto_repeat(int64_t repeat_millies, int64_t repeat_start = 500) -> void;
     auto disable_auto_repeat() -> void;
 
+    auto set_can_focus(bool new_state) -> std::shared_ptr<Button> {
+        this->can_focus = new_state;
+        return std::dynamic_pointer_cast<Button>(this->shared_from_this());
+    }
+
     auto set_is_default(bool new_state) -> std::shared_ptr<Button> {
         this->is_default = new_state;
         this->needs_redraw = true;
diff --git a/src/theme.cpp b/src/theme.cpp
index 94f040e..c9346fb 100644
--- a/src/theme.cpp
+++ b/src/theme.cpp
@@ -571,7 +571,7 @@ auto ThemePlasma::draw_button(Bitmap &content, bool has_focus, bool is_default,
                                    background2);
     }
 
-    if (has_frame || state != ButtonStates::Normal) {
+    if (has_frame || state != ButtonStates::Normal || has_focus) {
         content.draw_rounded_rectangle(0, 0, content.size.width, content.size.height - 1, 5, border,
                                        border);
         content.line(2, content.size.height - 1, content.size.width - 2, content.size.height - 1,
diff --git a/src/toolbar.cxx b/src/toolbar.cxx
index 13ef762..5a966c9 100644
--- a/src/toolbar.cxx
+++ b/src/toolbar.cxx
@@ -33,6 +33,7 @@ auto Toolbar::add_shortcut(std::shared_ptr<Shortcut> s) -> std::shared_ptr<Toolb
                                  }
                              })
                  ->set_has_frame(false)
+                 ->set_can_focus(false)
                  ->set_auto_shrink(true);
     if ((icon = window->platform->image_loader->loadFile(s->icon_name))) {
         b->set_icon(icon);