diff --git a/src/client/folder-list/folder-list-tree.vala b/src/client/folder-list/folder-list-tree.vala
index eaa1d981..e9163da1 100644
--- a/src/client/folder-list/folder-list-tree.vala
+++ b/src/client/folder-list/folder-list-tree.vala
@@ -25,14 +25,10 @@ public class FolderList.Tree : Sidebar.Tree, Geary.BaseInterface {
     private Application.NotificationContext? monitor = null;
 
     public Tree() {
-        base(new Gtk.TargetEntry[0], Gdk.DragAction.ASK, drop_handler);
+        base(TARGET_ENTRY_LIST, Gdk.DragAction.ASK, drop_handler);
         base_ref();
         entry_selected.connect(on_entry_selected);
 
-        // Set self as a drag destination.
-        Gtk.drag_dest_set(this, Gtk.DestDefaults.MOTION | Gtk.DestDefaults.HIGHLIGHT,
-            TARGET_ENTRY_LIST, Gdk.DragAction.COPY | Gdk.DragAction.MOVE);
-
         // GtkTreeView binds Ctrl+N to "move cursor to next".  Not so interested in that, so we'll
         // remove it.
         unowned Gtk.BindingSet? binding_set = Gtk.BindingSet.find("GtkTreeView");
@@ -213,22 +209,6 @@ public class FolderList.Tree : Sidebar.Tree, Geary.BaseInterface {
         folder_selected(null);
     }
 
-    public override bool drag_motion(Gdk.DragContext context, int x, int y, uint time) {
-        // Run the base version first.
-        bool ret = base.drag_motion(context, x, y, time);
-
-        // Update the cursor for copy or move.
-        Gdk.ModifierType mask;
-        double[] axes = new double[2];
-        context.get_device().get_state(context.get_dest_window(), axes, out mask);
-        if ((mask & Gdk.ModifierType.CONTROL_MASK) != 0) {
-            Gdk.drag_status(context, Gdk.DragAction.COPY, time);
-        } else {
-            Gdk.drag_status(context, Gdk.DragAction.MOVE, time);
-        }
-        return ret;
-    }
-
     private void on_ordinal_changed() {
         if (account_branches.size <= 1)
             return;
diff --git a/ui/geary.css b/ui/geary.css
index 85b07146..ab8c07fb 100644
--- a/ui/geary.css
+++ b/ui/geary.css
@@ -325,3 +325,12 @@ popover.geary-editor > grid {
 popover.geary-editor > grid > button.geary-setting-remove {
   margin-top: 12px;
 }
+
+/* FolderList.Tree */
+
+treeview.sidebar:drop(active).after,
+treeview.sidebar:drop(active).before,
+treeview.sidebar:drop(active).into {
+  border-top-style: solid;
+  border-bottom-style: solid;
+}