diff --git a/README.txt b/README.txt
index 2c9c7b7..8161550 100644
--- a/README.txt
+++ b/README.txt
@@ -1,6 +1,6 @@
 ---SUMMARY---
 
-Admin Toolbar intends to improve the default Drupal Toolbar to transformit into
+Admin Toolbar intends to improve the default Drupal Toolbar to transform it into
 a drop-down menu, providing a fast and full access to all administration links.
 
 For a full description visit project page:
@@ -30,6 +30,16 @@ For help regarding installation, visit:
 https://www.drupal.org/documentation/install/modules-themes/modules-8
 
 
+--CONFIGURATION--
+
+
+Admin toolbar uses the jQuery hover intent plugin by default.
+To disable this and fall back to using jQuery hover(), add the following
+to your settings.local.php file:
+
+$settings['admin_toolbar_disable_intent'] = TRUE;
+
+
 ---CONTACT---
 
 
diff --git a/admin_toolbar.libraries.yml b/admin_toolbar.libraries.yml
index 0a3ab1f..191e1a0 100644
--- a/admin_toolbar.libraries.yml
+++ b/admin_toolbar.libraries.yml
@@ -3,7 +3,19 @@ toolbar.tree:
     theme:
       css/admin.toolbar.css: {}
   js:
-    js/jquery.hoverIntent.js: {}
     js/admin_toolbar.js: {}
   dependencies:
     - core/jquery
+
+toolbar.tree.hoverintent:
+  js:
+    js/jquery.hoverIntent.js: {}
+    js/admin_toolbar.hoverintent.js: {}
+  dependencies:
+    - core/jquery
+
+toolbar.tree.hover:
+  js:
+    js/admin_toolbar.hover.js: {}
+  dependencies:
+    - core/jquery
diff --git a/admin_toolbar.module b/admin_toolbar.module
index 988d173..84b578d 100644
--- a/admin_toolbar.module
+++ b/admin_toolbar.module
@@ -8,6 +8,7 @@
 use Drupal\Core\Menu\MenuTreeParameters;
 use Drupal\Core\Routing\RouteMatchInterface;
 use Drupal\Core\Url;
+use Drupal\Core\Site\Settings;
 
 /**
  * Implements hook_toolbar_alter().
@@ -15,6 +16,15 @@ use Drupal\Core\Url;
 function admin_toolbar_toolbar_alter(&$items) {
   $items['administration']['tray']['toolbar_administration']['#pre_render'] = ['admin_toolbar_prerender_toolbar_administration_tray'];
   $items['administration']['#attached']['library'][] = 'admin_toolbar/toolbar.tree';
+
+  if (Settings::get('admin_toolbar_disable_intent') === TRUE) {
+    // Use jQuery hover() effect.
+    $items['administration']['#attached']['library'][] = 'admin_toolbar/toolbar.tree.hover';
+  }
+  else {
+    // User hoverIntent plugin.
+    $items['administration']['#attached']['library'][] = 'admin_toolbar/toolbar.tree.hoverintent';
+  }
 }
 
 /**
diff --git a/js/admin_toolbar.hover.js b/js/admin_toolbar.hover.js
new file mode 100644
index 0000000..5680ebe
--- /dev/null
+++ b/js/admin_toolbar.hover.js
@@ -0,0 +1,13 @@
+(function ($) {
+  $(document).ready(function () {
+    $('.toolbar-tray.is-active.toolbar-tray-horizontal .menu-item.menu-item--expanded').hover(function () {
+        // At the current depth, we should delete all "hover-intent" classes.
+        // Other wise we get unwanted behaviour where menu items are expanded while already in hovering other ones.
+        $(this).parent().find('li').removeClass('hover-intent');
+        $(this).addClass('hover-intent');
+      },
+      function () {
+        $(this).removeClass('hover-intent');
+      });
+  });
+})(jQuery);
diff --git a/js/admin_toolbar.hoverintent.js b/js/admin_toolbar.hoverintent.js
new file mode 100644
index 0000000..955e3bc
--- /dev/null
+++ b/js/admin_toolbar.hoverintent.js
@@ -0,0 +1,16 @@
+(function ($) {
+  $(document).ready(function () {
+    $('.toolbar-tray-horizontal li.menu-item--expanded, .toolbar-tray-horizontal ul li.menu-item--expanded .menu-item').hoverIntent({
+      over: function () {
+        // At the current depth, we should delete all "hover-intent" classes.
+        // Other wise we get unwanted behaviour where menu items are expanded while already in hovering other ones.
+        $(this).parent().find('li').removeClass('hover-intent');
+        $(this).addClass('hover-intent');
+      },
+      out: function () {
+        $(this).removeClass('hover-intent');
+      },
+      timeout: 250
+    });
+  });
+})(jQuery);
diff --git a/js/admin_toolbar.js b/js/admin_toolbar.js
index d2c2e96..9711316 100644
--- a/js/admin_toolbar.js
+++ b/js/admin_toolbar.js
@@ -1,18 +1,5 @@
 (function ($) {
   $(document).ready(function () {
     $('a.toolbar-icon').removeAttr('title');
-
-    $('.toolbar-tray-horizontal li.menu-item--expanded, .toolbar-tray-horizontal ul li.menu-item--expanded .menu-item').hoverIntent({
-      over: function () {
-        // At the current depth, we should delete all "hover-intent" classes.
-        // Other wise we get unwanted behaviour where menu items are expanded while already in hovering other ones.
-        $(this).parent().find('li').removeClass('hover-intent');
-        $(this).addClass('hover-intent');
-      },
-      out: function () {
-        $(this).removeClass('hover-intent');
-      },
-      timeout: 250
-    });
   });
 })(jQuery);