diff --git a/C4/Creators/Lib.pm b/C4/Creators/Lib.pm
index 0a57b598f1..d052427a38 100644
--- a/C4/Creators/Lib.pm
+++ b/C4/Creators/Lib.pm
@@ -155,7 +155,8 @@ sub get_all_templates {
     my %params = @_;
     my @templates = ();
     my $query = "SELECT " . ($params{'field_list'} ? $params{'field_list'} : '*') . " FROM creator_templates";
-    $query .= ($params{'filter'} ? " WHERE $params{'filter'};" : ';');
+    $query .= ($params{'filter'} ? " WHERE $params{'filter'} " : '');
+    $query .= ($params{'orderby'} ? " ORDER BY $params{'orderby'} " : '');
     my $sth = C4::Context->dbh->prepare($query);
     $sth->execute();
     if ($sth->err) {
@@ -181,7 +182,8 @@ sub get_all_layouts {
     my %params = @_;
     my @layouts = ();
     my $query = "SELECT " . ($params{'field_list'} ? $params{'field_list'} : '*') . " FROM creator_layouts";
-    $query .= ($params{'filter'} ? " WHERE $params{'filter'};" : ';');
+    $query .= ($params{'filter'} ? " WHERE $params{'filter'} " : '');
+    $query .= ($params{'orderby'} ? " ORDER BY $params{'orderby'} " : '');
     my $sth = C4::Context->dbh->prepare($query);
     $sth->execute();
     if ($sth->err) {
diff --git a/labels/label-print.pl b/labels/label-print.pl
index b65c7a6c55..dd895fbbbc 100755
--- a/labels/label-print.pl
+++ b/labels/label-print.pl
@@ -115,8 +115,8 @@ elsif ($op eq 'none') {
     @batch_ids = map{{batch_id => $_}} @batch_ids;
     @label_ids = map{{label_id => $_}} @label_ids;
     @item_numbers = map{{item_number => $_}} @item_numbers;
-    $templates = get_all_templates(field_list => 'template_id, template_code', filter => 'creator = "Labels"');
-    $layouts = get_all_layouts(field_list => 'layout_id, layout_name', filter => 'creator = "Labels"');
+    $templates = get_all_templates(field_list => 'template_id, template_code', filter => 'creator = "Labels"', orderby => 'template_code' );
+    $layouts = get_all_layouts(field_list => 'layout_id, layout_name', filter => 'creator = "Labels"', orderby => 'layout_name' );
     $output_formats = get_output_formats();
     $template->param(
                     batch_ids                   => \@batch_ids,