diff --git a/app/View/Components/Popup.php b/app/View/Components/Popup.php
index 702c9b9562..50a9b01e54 100644
--- a/app/View/Components/Popup.php
+++ b/app/View/Components/Popup.php
@@ -3,6 +3,7 @@
 namespace App\View\Components;
 
 use Illuminate\View\Component;
+use LibreNMS\Config;
 
 class Popup extends Component
 {
@@ -13,6 +14,8 @@ class Popup extends Component
      */
     public function render()
     {
-        return view('components.popup');
+        return Config::get('web_mouseover', true)
+            ? view('components.popup')
+            : view('components.nopopup');
     }
 }
diff --git a/resources/views/components/nopopup.blade.php b/resources/views/components/nopopup.blade.php
new file mode 100644
index 0000000000..6627cbe77b
--- /dev/null
+++ b/resources/views/components/nopopup.blade.php
@@ -0,0 +1,3 @@
+<div class="tw-inline-block">
+    {{ $slot }}
+</div>