diff --git a/resources/views/components/popover.blade.php b/resources/views/components/popover.blade.php
index 985c2622c9..b458950502 100644
--- a/resources/views/components/popover.blade.php
+++ b/resources/views/components/popover.blade.php
@@ -2,13 +2,13 @@
      role="button"
      data-controller="popover"
      data-action="click->popover#trigger"
-     data-container="body"
-     data-toggle="popover"
+     data-bs-container="body"
+     data-bs-toggle="popover"
      tabindex="0"
-     data-trigger="focus"
-     data-placement="{{ $placement }}"
-     data-delay-show="300"
-     data-delay-hide="200"
+     data-bs-trigger="click"
+     data-bs-placement="{{ $placement }}"
+     data-bs-delay-show="300"
+     data-bs-delay-hide="200"
      data-bs-content="{{ $content }}">
     <x-orchid-icon path="bs.question-lg" width="1em" height="1em"/>
 </sup>
diff --git a/tests/Unit/Support/BladeComponentTest.php b/tests/Unit/Support/BladeComponentTest.php
index e498096ad1..d27d58d0f7 100644
--- a/tests/Unit/Support/BladeComponentTest.php
+++ b/tests/Unit/Support/BladeComponentTest.php
@@ -54,4 +54,22 @@ public function testAnonymous(): void
 
         $this->assertStringContainsString('Hello world', $view);
     }
+
+    public function testPopoverComponent(): void
+    {
+        $view = Blade::renderComponent('orchid-popover', [
+            'content' => 'Hello world',
+        ]);
+
+        $this->assertStringContainsString('data-bs-content="Hello world"', $view);
+        $this->assertStringContainsString('data-bs-placement="auto"', $view);
+
+        $view = Blade::renderComponent('orchid-popover', [
+            'content'   => 'Hello world',
+            'placement' => 'right',
+        ]);
+
+        $this->assertStringContainsString('data-bs-content="Hello world"', $view);
+        $this->assertStringContainsString('data-bs-placement="right"', $view);
+    }
 }