diff --git a/lib/cannery_web/views/view_helpers.ex b/lib/cannery_web/views/view_helpers.ex
index 3df71fa4..cfd7f6df 100644
--- a/lib/cannery_web/views/view_helpers.ex
+++ b/lib/cannery_web/views/view_helpers.ex
@@ -95,11 +95,12 @@ defmodule CanneryWeb.ViewHelpers do
     ~H"""
     <label for={@id} class="inline-flex relative items-center cursor-pointer">
       <input
+        id={@id}
         type="checkbox"
         value={@value}
         checked={@value}
-        id={@id}
         class="sr-only peer"
+        data-qa={@id}
         {
           if assigns |> Map.has_key?(:target),
             do: %{"phx-click" => @action, "phx-value-value" => @value, "phx-target" => @target},
diff --git a/test/cannery_web/live/ammo_type_live_test.exs b/test/cannery_web/live/ammo_type_live_test.exs
index 7cf31085..373972b2 100644
--- a/test/cannery_web/live/ammo_type_live_test.exs
+++ b/test/cannery_web/live/ammo_type_live_test.exs
@@ -6,7 +6,7 @@ defmodule CanneryWeb.AmmoTypeLiveTest do
   use CanneryWeb.ConnCase
   import Phoenix.LiveViewTest
   import CanneryWeb.Gettext
-  alias Cannery.Ammo
+  alias Cannery.{Ammo, Repo}
 
   @moduletag :ammo_type_live_test
 
@@ -26,6 +26,14 @@ defmodule CanneryWeb.AmmoTypeLiveTest do
     "name" => "some updated name",
     "grains" => 456
   }
+  @ammo_group_attrs %{
+    "notes" => "some ammo group",
+    "count" => 20
+  }
+  @shot_group_attrs %{
+    "notes" => "some shot group",
+    "count" => 20
+  }
 
   # @invalid_attrs %{
   #   "bullet_type" => nil,
@@ -40,6 +48,15 @@ defmodule CanneryWeb.AmmoTypeLiveTest do
     %{ammo_type: ammo_type_fixture(@create_attrs, current_user)}
   end
 
+  defp create_empty_ammo_group(%{ammo_type: ammo_type, current_user: current_user}) do
+    container = container_fixture(current_user)
+    {1, [ammo_group]} = ammo_group_fixture(@ammo_group_attrs, ammo_type, container, current_user)
+    shot_group = shot_group_fixture(@shot_group_attrs, current_user, ammo_group)
+    ammo_group = ammo_group |> Repo.reload!()
+
+    %{ammo_group: ammo_group, shot_group: shot_group}
+  end
+
   describe "Index" do
     setup [:register_and_log_in_user, :create_ammo_type]
 
@@ -105,7 +122,7 @@ defmodule CanneryWeb.AmmoTypeLiveTest do
     end
   end
 
-  describe "Show" do
+  describe "Show ammo type" do
     setup [:register_and_log_in_user, :create_ammo_type]
 
     test "displays ammo_type", %{conn: conn, ammo_type: ammo_type} do
@@ -139,4 +156,21 @@ defmodule CanneryWeb.AmmoTypeLiveTest do
       assert html =~ "some updated bullet_type"
     end
   end
+
+  describe "Show ammo type with empty ammo group" do
+    setup [:register_and_log_in_user, :create_ammo_type, :create_empty_ammo_group]
+
+    test "hides empty ammo groups by default",
+         %{conn: conn, ammo_type: ammo_type} do
+      {:ok, show_live, html} = live(conn, Routes.ammo_type_show_path(conn, :show, ammo_type))
+
+      assert html =~ gettext("Show used")
+      refute html =~ "some ammo group"
+
+      html = show_live |> element("[data-qa=\"toggle_show_used\"]") |> render_click()
+
+      assert html =~ "some ammo group"
+      assert html =~ "Empty"
+    end
+  end
 end
diff --git a/test/support/fixtures.ex b/test/support/fixtures.ex
index 07bb7b2f..f3fac63c 100644
--- a/test/support/fixtures.ex
+++ b/test/support/fixtures.ex
@@ -76,7 +76,7 @@ defmodule Cannery.Fixtures do
   def shot_group_fixture(attrs \\ %{}, %User{} = user, %AmmoGroup{} = ammo_group) do
     attrs
     |> Enum.into(%{
-      "count" => 25,
+      "count" => 20,
       "date" => ~N[2022-02-13 03:17:00],
       "notes" => "some notes"
     })