diff --git a/coreplugins/dronedb/ddb.py b/coreplugins/dronedb/ddb.py
index 298b75a5..8026b500 100644
--- a/coreplugins/dronedb/ddb.py
+++ b/coreplugins/dronedb/ddb.py
@@ -178,6 +178,9 @@ class DroneDB:
             # Get the folders
             response = self.wrapped_call('GET', self.__get_files_list_url.format(orgSlug, dsSlug), params=params)
 
+            # Exclude folders
+            files = filter(lambda itm: itm['type'] != 1, response.json())
+
             return [
                 {'path': o['path'], 
                 # extract name from path
@@ -185,7 +188,7 @@ class DroneDB:
                 'type': o['type'], 
                 'size': o['size'],
                 'url': self.__download_file_url.format(orgSlug, dsSlug, o['path'])
-                } for o in response.json()]
+                } for o in files]
             
         except Exception as e:
             raise Exception("Failed to get files list.") from e
diff --git a/coreplugins/dronedb/public/components/SelectUrlDialog.jsx b/coreplugins/dronedb/public/components/SelectUrlDialog.jsx
index 593ca1c6..462f45bc 100644
--- a/coreplugins/dronedb/public/components/SelectUrlDialog.jsx
+++ b/coreplugins/dronedb/public/components/SelectUrlDialog.jsx
@@ -143,8 +143,8 @@ export default class SelectUrlDialog extends Component {
 				
 				var dss = result.map(ds => {
 					return { label: ds.name !== ds.slug ? 
-						`${ds.name} (${ds.slug}) - ${ds.entries} files (${this.formatBytes(ds.size)})`: 
-						`${ds.name} - ${ds.entries} files (${this.formatBytes(ds.size)})`, name: ds.name, value: ds.slug };
+						`${ds.name} (${ds.slug}) - ${ds.entries} entries (${this.formatBytes(ds.size)})`: 
+						`${ds.name} - ${ds.entries} entries (${this.formatBytes(ds.size)})`, name: ds.name, value: ds.slug };
 				});
 
 				if (dss.length > 0) {