diff --git a/importexport/inc/class.importexport_wizard_basic_import_csv.inc.php b/importexport/inc/class.importexport_wizard_basic_import_csv.inc.php
index 23e940b2d6..c7f51c2bf4 100644
--- a/importexport/inc/class.importexport_wizard_basic_import_csv.inc.php
+++ b/importexport/inc/class.importexport_wizard_basic_import_csv.inc.php
@@ -177,7 +177,7 @@ class importexport_wizard_basic_import_csv
 								$content['field_mapping'][$index] = $best_match;
 							}
 						}
-					} elseif($content['plugin_options']['csv_fields']) {
+					} elseif(!$content['csv_fields'] && $content['plugin_options']['csv_fields']) {
 						$content['csv_fields'] = $content['plugin_options']['csv_fields'];
 					}
 					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],1);