diff --git a/resources/views/popover.blade.php b/resources/views/popover-column.blade.php
similarity index 100%
rename from resources/views/popover.blade.php
rename to resources/views/popover-column.blade.php
diff --git a/resources/views/popover-entry.blade.php b/resources/views/popover-entry.blade.php
new file mode 100644
index 0000000..fbe2e60
--- /dev/null
+++ b/resources/views/popover-entry.blade.php
@@ -0,0 +1,40 @@
+<div x-data class="fi-popover">
+    @php
+        $getState = $getState();
+        $getTrigger = $getTrigger();
+        $getPlacement = $getPlacement();
+        $getOffset = $getOffset();
+        $getPopOverMaxWidth = $getPopOverMaxWidth();
+        $getIcon = $getIcon($getState);
+    @endphp
+    <template x-ref="template">
+        <div class="fi-popover-content">
+            {{ $getContent() }}
+        </div>
+    </template>
+
+    <button
+        class="w-full fi-popover-trigger cursor-pointer flex items-center gap-2"
+        x-tooltip="{
+            trigger: '{{ $getTrigger }}',
+            placement: '{{ $getPlacement }}',
+            offset: @js($getOffset),
+            maxWidth: '{{ $getPopOverMaxWidth }}',
+
+            content: () => $refs.template.innerHTML,
+            appendTo: $root,
+            allowHTML: true,
+            interactive: true,
+            theme: $store.theme,
+        }">
+
+        {{ $getState }}
+
+        @if($getIcon)
+            <x-filament::icon
+                :icon="$getIcon"
+                class="h-5 w-5 text-gray-500 dark:text-gray-400"
+            />
+        @endif
+    </button>
+</div>
diff --git a/src/Infolists/PopoverEntry.php b/src/Infolists/PopoverEntry.php
index 223b67a..9c4673d 100644
--- a/src/Infolists/PopoverEntry.php
+++ b/src/Infolists/PopoverEntry.php
@@ -11,5 +11,5 @@ class PopoverEntry extends Entry
     use HasIcon;
     use HasPopover;
 
-    protected string $view = 'zeus-popover::popover';
+    protected string $view = 'zeus-popover::popover-entry';
 }
diff --git a/src/Tables/PopoverColumn.php b/src/Tables/PopoverColumn.php
index a67ef6a..6b90c89 100644
--- a/src/Tables/PopoverColumn.php
+++ b/src/Tables/PopoverColumn.php
@@ -15,7 +15,7 @@ class PopoverColumn extends Column
     use HasDescription;
     use HasPopover;
 
-    protected string $view = 'zeus-popover::popover';
+    protected string $view = 'zeus-popover::popover-column';
 
     protected function setUp(): void
     {