diff --git a/libraries/joomla/form/fields/filelist.php b/libraries/joomla/form/fields/filelist.php
index 4c8a42e5e4f85..85c57db0c285f 100644
--- a/libraries/joomla/form/fields/filelist.php
+++ b/libraries/joomla/form/fields/filelist.php
@@ -192,8 +192,11 @@ protected function getOptions()
 		{
 			$path = JPATH_ROOT . '/' . $path;
 		}
-
-		// Prepend some default options based on field attributes.
+		
+		// Clean input path, fix DS issue on windows
+		$path = JPath::clean($path);
+		
+ 		// Prepend some default options based on field attributes.
 		if (!$this->hideNone)
 		{
 			$options[] = JHtml::_('select.option', '-1', JText::alt('JOPTION_DO_NOT_USE', preg_replace('/[^a-zA-Z0-9_\-]/', '_', $this->fieldname)));
diff --git a/libraries/joomla/form/fields/folderlist.php b/libraries/joomla/form/fields/folderlist.php
index 259901aa27166..098660eab3bfb 100644
--- a/libraries/joomla/form/fields/folderlist.php
+++ b/libraries/joomla/form/fields/folderlist.php
@@ -188,6 +188,9 @@ protected function getOptions()
 		{
 			$path = JPATH_ROOT . '/' . $path;
 		}
+		
+		// Clean input path, fix DS issue on windows
+		$path = JPath::clean($path);
 
 		// Prepend some default options based on field attributes.
 		if (!$this->hideNone)