diff --git a/gresources/nemo-file-management-properties.glade b/gresources/nemo-file-management-properties.glade
index 9388dcd51..709a70f02 100644
--- a/gresources/nemo-file-management-properties.glade
+++ b/gresources/nemo-file-management-properties.glade
@@ -1186,6 +1186,22 @@ along with .  If not, see <http://www.gnu.org/licenses/>.
                                             <property name="position">7</property>
                                           </packing>
                                         </child>
+                                        <child>
+                                          <object class="GtkCheckButton" id="expand_row_on_dnd_dwell_checkbutton">
+                                            <property name="label" translatable="yes">Automatically expand rows during drag-and-drop</property>
+                                            <property name="visible">True</property>
+                                            <property name="can-focus">True</property>
+                                            <property name="receives-default">False</property>
+                                            <property name="use-underline">True</property>
+                                            <property name="xalign">0</property>
+                                            <property name="draw-indicator">True</property>
+                                          </object>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">False</property>
+                                            <property name="position">8</property>
+                                          </packing>
+                                        </child>
                                       </object>
                                     </child>
                                   </object>
diff --git a/libnemo-private/nemo-global-preferences.h b/libnemo-private/nemo-global-preferences.h
index d3f93b2e1..e1f28f581 100644
--- a/libnemo-private/nemo-global-preferences.h
+++ b/libnemo-private/nemo-global-preferences.h
@@ -269,6 +269,7 @@ typedef enum
 #define NEMO_PREFERENCES_NEVER_QUEUE_FILE_OPS          "never-queue-file-ops"
 
 #define NEMO_PREFERENCES_CLICK_DOUBLE_PARENT_FOLDER    "click-double-parent-folder"
+#define NEMO_PREFERENCES_EXPAND_ROW_ON_DND_DWELL       "expand-row-on-dnd-dwell"
 
 #define NEMO_PREFERENCES_SHOW_MIME_MAKE_EXECUTABLE     "enable-mime-actions-make-executable"
 #define NEMO_PREFERENCES_DEFERRED_ATTR_PRELOAD_LIMIT   "deferred-attribute-preload-limit"
diff --git a/libnemo-private/nemo-tree-view-drag-dest.c b/libnemo-private/nemo-tree-view-drag-dest.c
index 035768c34..c09c47093 100644
--- a/libnemo-private/nemo-tree-view-drag-dest.c
+++ b/libnemo-private/nemo-tree-view-drag-dest.c
@@ -34,6 +34,7 @@
 
 #include "nemo-file-dnd.h"
 #include "nemo-file-changes-queue.h"
+#include "nemo-global-preferences.h"
 #include "nemo-icon-dnd.h"
 #include "nemo-link.h"
 
@@ -522,14 +523,16 @@ drag_motion_callback (GtkWidget *widget,
 		    gtk_tree_path_compare (old_drop_path, drop_path) != 0)) {
 			remove_expand_timeout (dest);
 		}
-		if (dest->details->expand_id == 0 && drop_path != NULL) {
-			gtk_tree_model_get_iter (model, &drop_iter, drop_path);
-			if (gtk_tree_model_iter_has_child (model, &drop_iter)) {
-				dest->details->expand_id = g_timeout_add_seconds (HOVER_EXPAND_TIMEOUT,
-									  expand_timeout,
-									  dest);
-			}
-		}
+        if (g_settings_get_boolean (nemo_preferences, NEMO_PREFERENCES_EXPAND_ROW_ON_DND_DWELL)) {
+            if (dest->details->expand_id == 0 && drop_path != NULL) {
+                gtk_tree_model_get_iter (model, &drop_iter, drop_path);
+                if (gtk_tree_model_iter_has_child (model, &drop_iter)) {
+                    dest->details->expand_id = g_timeout_add_seconds (HOVER_EXPAND_TIMEOUT,
+                                                                      expand_timeout,
+                                                                      dest);
+                }
+            }
+        }
 	} else {
 		clear_drag_dest_row (dest);
 		remove_expand_timeout (dest);
diff --git a/libnemo-private/org.nemo.gschema.xml b/libnemo-private/org.nemo.gschema.xml
index f54c1dde3..3577a610b 100644
--- a/libnemo-private/org.nemo.gschema.xml
+++ b/libnemo-private/org.nemo.gschema.xml
@@ -97,6 +97,10 @@
       <summary>Enables renaming of icons by two times clicking with pause between clicks</summary>
       <description>If set to true, then icons in all Nemo windows will be able to get renamed quickly. Users should click two times on icons with a pause time more than double-click time of their system.</description>
     </key>
+    <key name="expand-row-on-dnd-dwell" type="b">
+      <default>true</default>
+      <summary>During drag-and-drop operations, automatically expand rows when hovering them briefly</summary>
+    </key>
     <key name="show-location-entry" type="b">
       <default>false</default>
       <summary>Show the location entry by default</summary>
diff --git a/src/nemo-file-management-properties.c b/src/nemo-file-management-properties.c
index ffc86ad26..6e86fceb4 100644
--- a/src/nemo-file-management-properties.c
+++ b/src/nemo-file-management-properties.c
@@ -114,6 +114,7 @@
 
 #define NEMO_FILE_MANAGEMENT_PROPERTIES_NEMO_PREFERENCES_SKIP_FILE_OP_QUEUE_WIDGET "skip_file_op_queue_checkbutton"
 #define NEMO_FILE_MANAGEMENT_PROPERTIES_NEMO_PREFERENCES_CLICK_DBL_PARENT_FOLDER_WIDGET "click_double_parent_folder_checkbutton"
+#define NEMO_FILE_MANAGEMENT_PROPERTIES_NEMO_PREFERENCES_EXPAND_ROW_ON_DND_DWELL_WIDGET "expand_row_on_dnd_dwell_checkbutton"
 
 /* int enums */
 #define NEMO_FILE_MANAGEMENT_PROPERTIES_THUMBNAIL_LIMIT_WIDGET "preview_image_size_combobox"
@@ -1100,6 +1101,10 @@ nemo_file_management_properties_dialog_setup (GtkBuilder  *builder,
                        NEMO_FILE_MANAGEMENT_PROPERTIES_NEMO_PREFERENCES_CLICK_DBL_PARENT_FOLDER_WIDGET,
                        NEMO_PREFERENCES_CLICK_DOUBLE_PARENT_FOLDER);
 
+    bind_builder_bool (builder, nemo_preferences,
+                       NEMO_FILE_MANAGEMENT_PROPERTIES_NEMO_PREFERENCES_EXPAND_ROW_ON_DND_DWELL_WIDGET,
+                       NEMO_PREFERENCES_EXPAND_ROW_ON_DND_DWELL);
+
     setup_tooltip_items (builder);
     connect_tooltip_items (builder);