diff --git a/Applications/FileManager/main.cpp b/Applications/FileManager/main.cpp
index eaa1ce100a6..fca3215f977 100644
--- a/Applications/FileManager/main.cpp
+++ b/Applications/FileManager/main.cpp
@@ -669,8 +669,6 @@ int run_in_windowed_mode(RefPtr<Core::ConfigFile> config, String initial_locatio
     };
 
     directory_view.on_drop = [&](const GUI::AbstractView&, const GUI::ModelIndex& index, const GUI::DropEvent& event) {
-        if (!index.is_valid())
-            return;
         if (!event.mime_data().has_urls())
             return;
         auto urls = event.mime_data().urls();
@@ -690,6 +688,9 @@ int run_in_windowed_mode(RefPtr<Core::ConfigFile> config, String initial_locatio
                 target_node.full_path(directory_view.model()).characters(),
                 FileSystemPath(url_to_copy.path()).basename().characters());
 
+            if (url_to_copy.path() == new_path)
+                continue;
+
             if (!FileUtils::copy_file_or_directory(url_to_copy.path(), new_path)) {
                 auto error_message = String::format("Could not copy %s into %s.",
                     url_to_copy.to_string().characters(),
diff --git a/Libraries/LibGUI/AbstractView.cpp b/Libraries/LibGUI/AbstractView.cpp
index 52c73063a5e..7da84be7da3 100644
--- a/Libraries/LibGUI/AbstractView.cpp
+++ b/Libraries/LibGUI/AbstractView.cpp
@@ -350,9 +350,6 @@ void AbstractView::drop_event(DropEvent& event)
         return;
 
     auto index = index_at_event_position(event.position());
-    if (!index.is_valid())
-        return;
-
     if (on_drop)
         on_drop(index, event);
 }