diff --git a/striker-ui/components/Anvils/index.tsx b/striker-ui/components/Anvils/index.tsx
index c0eec318..e149019f 100644
--- a/striker-ui/components/Anvils/index.tsx
+++ b/striker-ui/components/Anvils/index.tsx
@@ -1,13 +1,11 @@
-import { useContext } from 'react';
 import Panel from '../Panel';
 import PeriodicFetch from '../../lib/fetchers/periodicFetch';
 import SelectedAnvil from './SelectedAnvil';
 import AnvilList from './AnvilList';
 
-import { AnvilContext } from '../AnvilContext';
+import sortAnvils from './sortAnvils';
 
 const Anvils = ({ list }: { list: AnvilList | undefined }): JSX.Element => {
-  const { uuid } = useContext(AnvilContext);
   const anvils: AnvilListItem[] = [];
 
   list?.anvils.forEach((anvil: AnvilListItem) => {
@@ -21,14 +19,11 @@ const Anvils = ({ list }: { list: AnvilList | undefined }): JSX.Element => {
       anvil_state: data?.anvil_state,
     });
   });
+
   return (
     <Panel>
-      {uuid !== '' && (
-        <SelectedAnvil
-          anvil={anvils[anvils.findIndex((anvil) => anvil.anvil_uuid === uuid)]}
-        />
-      )}
-      <AnvilList list={anvils} />
+      <SelectedAnvil list={anvils} />
+      <AnvilList list={sortAnvils(anvils)} />
     </Panel>
   );
 };