diff --git a/Settings.ui b/Settings.ui
index 9b36800..9690589 100644
--- a/Settings.ui
+++ b/Settings.ui
@@ -5220,12 +5220,12 @@
                   </object>
                 </child>
                 <child>
-                  <object class="GtkListBoxRow" id="show_window_previews">
+                  <object class="GtkListBoxRow" id="show_hover">
                     <property name="width_request">100</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <child>
-                      <object class="GtkGrid" id="show_window_previews_grid">
+                      <object class="GtkGrid" id="show_hover_grid">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="margin_left">12</property>
@@ -5297,6 +5297,32 @@
                             <property name="top_attach">0</property>
                           </packing>
                         </child>
+                        <child>
+                          <object class="GtkSwitch" id="show_tooltip_switch">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="halign">end</property>
+                            <property name="valign">center</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="top_attach">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="show_tooltip_label">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="hexpand">True</property>
+                            <property name="label" translatable="yes">Show tooltip on hover</property>
+                            <property name="use_markup">True</property>
+                            <property name="xalign">0</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">0</property>
+                            <property name="top_attach">1</property>
+                          </packing>
+                        </child>
                       </object>
                     </child>
                   </object>
diff --git a/appIcons.js b/appIcons.js
index add4294..10b0d11 100644
--- a/appIcons.js
+++ b/appIcons.js
@@ -314,8 +314,9 @@ var taskbarAppIcon = new Lang.Class({
     },
 
     shouldShowTooltip: function() {
-        if (!this.isLauncher && this._dtpSettings.get_boolean("show-window-previews") &&
-            this.getAppIconInterestingWindows().length > 0) {
+        if (!this._dtpSettings.get_boolean('show-tooltip') || 
+            (!this.isLauncher && this._dtpSettings.get_boolean("show-window-previews") &&
+             this.getAppIconInterestingWindows().length > 0)) {
             return false;
         } else {
             return this.actor.hover && !this.window && 
@@ -1551,7 +1552,8 @@ var ShowAppsIconWrapper = new Lang.Class({
     },
 
     shouldShowTooltip: function() {
-        return this.actor.hover && (!this._menu || !this._menu.isOpen);
+        return this._dtpSettings.get_boolean('show-tooltip') && 
+               (this.actor.hover && (!this._menu || !this._menu.isOpen));
     },
 
     destroy: function() {
diff --git a/prefs.js b/prefs.js
index ae8b37c..a1644c4 100644
--- a/prefs.js
+++ b/prefs.js
@@ -918,14 +918,22 @@ const Settings = new Lang.Class({
                             this._builder.get_object('show_appmenu_switch'),
                             'active',
                             Gio.SettingsBindFlags.DEFAULT);
+
         this._settings.bind('show-window-previews',
                             this._builder.get_object('show_window_previews_switch'),
                             'active',
                             Gio.SettingsBindFlags.DEFAULT);
-       this._settings.bind('show-window-previews',
+
+        this._settings.bind('show-window-previews',
                             this._builder.get_object('show_window_previews_button'),
                             'sensitive',
                             Gio.SettingsBindFlags.DEFAULT);
+
+        this._settings.bind('show-tooltip',
+                            this._builder.get_object('show_tooltip_switch'),
+                            'active',
+                            Gio.SettingsBindFlags.DEFAULT);
+
         this._settings.bind('show-favorites',
                             this._builder.get_object('show_favorite_switch'),
                             'active',
diff --git a/schemas/org.gnome.shell.extensions.dash-to-panel.gschema.xml b/schemas/org.gnome.shell.extensions.dash-to-panel.gschema.xml
index ceccb12..97d2fef 100644
--- a/schemas/org.gnome.shell.extensions.dash-to-panel.gschema.xml
+++ b/schemas/org.gnome.shell.extensions.dash-to-panel.gschema.xml
@@ -360,6 +360,11 @@
       <summary>Show window preview</summary>
       <description>Show preview of running window on hover of app icon</description>
     </key>
+    <key type="b" name="show-tooltip">
+      <default>true</default>
+      <summary>Show tooltip</summary>
+      <description>Show tooltip on hover of app icon</description>
+    </key>
     <key type="b" name="show-favorites">
       <default>true</default>
       <summary>Show favorites apps</summary>