diff --git a/data/dock.gschema.xml b/data/dock.gschema.xml
index 6b50086d..17d02a53 100644
--- a/data/dock.gschema.xml
+++ b/data/dock.gschema.xml
@@ -8,6 +8,11 @@
     <value nick='always' value='4'/>
   </enum>
 
+  <enum id="DNDBehavior">
+    <value nick='none' value='0'/>
+    <value nick='unpin' value='1'/>
+  </enum>
+
   <schema path="/io/elementary/dock/" id="io.elementary.dock">
     <key enum="HideMode" name="autohide-mode">
       <default>'overlapping-focus-window'</default>
@@ -26,6 +31,12 @@
       <summary>An ordered array of app id's to show as launchers</summary>
       <description>An ordered array of app id's to show as launchers</description>
     </key>
+
+    <key enum="DNDBehavior" name="drag-off-dock-behavior">
+      <default>'unpin'</default>
+      <summary>What to do when a launcher is dragged off the dock.</summary>
+      <description>What happens when a launcher is dragged off the dock and released there</description>
+    </key>
   </schema>
   <schema path="/io/elementary/dock/keybindings/" id="io.elementary.dock.keybindings">
     <key type="as" name="launch-dock-1">
diff --git a/src/Launcher.vala b/src/Launcher.vala
index c2798948..161bd376 100644
--- a/src/Launcher.vala
+++ b/src/Launcher.vala
@@ -406,7 +406,7 @@ public class Dock.Launcher : Gtk.Box {
     }
 
     private bool on_drag_cancel (Gdk.Drag drag, Gdk.DragCancelReason reason) {
-        if (app.pinned && reason == NO_TARGET) {
+        if (app.pinned && reason == NO_TARGET && settings.get_enum ("drag-off-dock-behavior") == 1) {
             var popover = new PoofPopover ();
 
             unowned var window = (MainWindow) get_root ();