diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-array-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-array-prototype.c
index 416804ccc..0f008ca24 100644
--- a/jerry-core/ecma/builtin-objects/ecma-builtin-array-prototype.c
+++ b/jerry-core/ecma/builtin-objects/ecma-builtin-array-prototype.c
@@ -2441,8 +2441,11 @@ ecma_builtin_array_prototype_object_copy_within (const ecma_value_t args[], /**<
 
         for (; count > 0; count--)
         {
+          ecma_value_t copy_value = ecma_copy_value_if_not_object (buffer_p[start]);
+
           ecma_free_value_if_not_object (buffer_p[target]);
-          buffer_p[target] = ecma_copy_value_if_not_object (buffer_p[start]);
+
+          buffer_p[target] = copy_value;
 
           if (forward)
           {
diff --git a/tests/jerry/es2015/regression-test-issue-3580.js b/tests/jerry/es2015/regression-test-issue-3580.js
new file mode 100644
index 000000000..ae3717325
--- /dev/null
+++ b/tests/jerry/es2015/regression-test-issue-3580.js
@@ -0,0 +1,19 @@
+// Copyright JS Foundation and other contributors, http://js.foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+var func = function(val, idx) {
+    return val + idx
+};
+
+String([0, "X"].map(func).copyWithin([]));