diff --git a/lib/galaxy/tools/parameters/grouping.py b/lib/galaxy/tools/parameters/grouping.py
index 91156d40fa7c..9a48cddfa795 100644
--- a/lib/galaxy/tools/parameters/grouping.py
+++ b/lib/galaxy/tools/parameters/grouping.py
@@ -211,6 +211,11 @@ def get_composite_dataset_name(self, context):
         dataset_name = context.get('files_metadata|base_name', None)
         if dataset_name is None:
             dataset_name = context.get('files_metadata', {}).get('base_name', None)
+        if dataset_name is None:
+            filenames = list()
+            for composite_file in context.get('files', []):
+                filenames.append(composite_file.get('file_data', {}).get('filename', ''))
+            dataset_name = os.path.commonprefix(filenames).rstrip('.') or None
         if dataset_name is None:
             dataset_name = 'Uploaded Composite Dataset (%s)' % self.get_file_type(context)
         return dataset_name