diff --git a/src/FilterLists.Web/ClientApp/modules/home/components/listsTable/columns/Languages.tsx b/src/FilterLists.Web/ClientApp/modules/home/components/listsTable/columns/Languages.tsx
index 47dc37e12..a91b5d6e4 100644
--- a/src/FilterLists.Web/ClientApp/modules/home/components/listsTable/columns/Languages.tsx
+++ b/src/FilterLists.Web/ClientApp/modules/home/components/listsTable/columns/Languages.tsx
@@ -33,7 +33,8 @@ const Filter = (props: any, languages: ILanguage[]) =>
             value={props.filter ? props.filter.value : "any"}>
         <option value="any">Any</option>
         {languages.length > 0
-             ? languages.map((l: ILanguage, i: number) => <option value={l.id} key={i}>{l.name}</option>)
+             ? languages.sort((a, b) => a.name.localeCompare(b.name))
+             .map((l: ILanguage, i: number) => <option value={l.id} key={i}>{l.name}</option>)
              : null}
     </select>;
 
diff --git a/src/FilterLists.Web/ClientApp/modules/home/components/listsTable/columns/Software.tsx b/src/FilterLists.Web/ClientApp/modules/home/components/listsTable/columns/Software.tsx
index a8976fa22..f5a5b55e4 100644
--- a/src/FilterLists.Web/ClientApp/modules/home/components/listsTable/columns/Software.tsx
+++ b/src/FilterLists.Web/ClientApp/modules/home/components/listsTable/columns/Software.tsx
@@ -34,7 +34,7 @@ const Filter = (props: any, software: ISoftware[]) =>
         value={props.filter ? props.filter.value : "any"}>
         <option value="any">Any</option>
         {software.length > 0
-             ? software.map(
+             ? software.sort((a, b) => a.name.localeCompare(b.name)).map(
                  (s: ISoftware, i: number) => <option value={s.id} key={i}>{s.name}</option>)
              : null}
     </select>;
@@ -42,5 +42,5 @@ const Filter = (props: any, software: ISoftware[]) =>
 const Cell = (listSyntaxId: number, software: ISoftware[]) =>
     listSyntaxId
     ? software.filter((s: ISoftware) => s.syntaxIds.indexOf(listSyntaxId) > -1)
-              .map((s: ISoftware, i: number) => <SoftwareIcon id={s.id} key={i}/>)
+    .map((s: ISoftware, i: number) => <SoftwareIcon id={s.id} key={i}/>)
     : null;
\ No newline at end of file