diff --git a/app/frontend/src/javascript/components/machines/machine-card.tsx b/app/frontend/src/javascript/components/machines/machine-card.tsx
index c81b4f72f..e10b6d42d 100644
--- a/app/frontend/src/javascript/components/machines/machine-card.tsx
+++ b/app/frontend/src/javascript/components/machines/machine-card.tsx
@@ -16,6 +16,21 @@ interface MachineCardProps {
 const MachineCardComponent: React.FC<MachineCardProps> = ({ machine, onShowMachine, onReserveMachine }) => {
   const { t } = useTranslation('public');
 
+  /**
+   * Callback triggered when the user clicks on the 'reserve' button.
+   * We handle the training verification process here, before redirecting the user to the reservation calendar.
+   */
+  const handleReserveMachine = (): void => {
+    onReserveMachine(machine);
+  }
+
+  /**
+   * Callback triggered when the user clicks on the 'view' button
+   */
+  const handleShowMachine = (): void => {
+    onShowMachine(machine);
+  }
+
   const machinePicture = (): ReactNode => {
     if (!machine.machine_image) {
       return (
@@ -33,13 +48,6 @@ const MachineCardComponent: React.FC<MachineCardProps> = ({ machine, onShowMachi
     )
   }
 
-  const handleReserveMachine = (): void => {
-    onReserveMachine(machine);
-  }
-
-  const handleShowMachine = (): void => {
-    onShowMachine(machine);
-  }
   return (
     <div className="machine-card">
       {machinePicture()}
diff --git a/app/frontend/src/javascript/components/machines/machines-filters.tsx b/app/frontend/src/javascript/components/machines/machines-filters.tsx
new file mode 100644
index 000000000..776d5a1a8
--- /dev/null
+++ b/app/frontend/src/javascript/components/machines/machines-filters.tsx
@@ -0,0 +1,50 @@
+import React from 'react';
+import Select from 'react-select';
+import { useTranslation } from 'react-i18next';
+
+interface MachinesFiltersProps {
+  onStatusSelected: (enabled: boolean) => void,
+}
+
+/**
+ * Option format, expected by react-select
+ * @see https://github.com/JedWatson/react-select
+ */
+type selectOption = { value: boolean, label: string };
+
+export const MachinesFilters: React.FC<MachinesFiltersProps> = ({ onStatusSelected }) => {
+  const { t } = useTranslation('public');
+
+  const defaultValue = { value: true, label: t('app.public.machines_filters.status_enabled') };
+
+  /**
+   * Provides boolean options in the react-select format (yes/no/all)
+   */
+  const buildBooleanOptions = (): Array<selectOption> => {
+    return [
+      defaultValue,
+      { value: false, label: t('app.public.machines_filters.status_disabled') },
+      { value: null, label: t('app.public.machines_filters.status_all') },
+    ]
+  }
+
+  /**
+   * Callback triggered when the user selects a machine status in the dropdown list
+   */
+  const handleStatusSelected = (option: selectOption): void => {
+    onStatusSelected(option.value);
+  }
+
+  return (
+    <div className="machines-filters">
+      <div className="status-filter">
+        <label htmlFor="status">{t('app.public.machines_filters.show_machines')}</label>
+        <Select defaultValue={defaultValue}
+                id="status"
+                className="status-select"
+                onChange={handleStatusSelected}
+                options={buildBooleanOptions()}/>
+      </div>
+    </div>
+  )
+}
diff --git a/app/frontend/src/javascript/components/machines/machines-list.tsx b/app/frontend/src/javascript/components/machines/machines-list.tsx
index 3de39f41f..bbbec0759 100644
--- a/app/frontend/src/javascript/components/machines/machines-list.tsx
+++ b/app/frontend/src/javascript/components/machines/machines-list.tsx
@@ -5,6 +5,7 @@ import { react2angular } from 'react2angular';
 import { Loader } from '../base/loader';
 import MachineAPI from '../../api/machine';
 import { MachineCard } from './machine-card';
+import { MachinesFilters } from './machines-filters';
 
 declare var Application: IApplication;
 
@@ -18,19 +19,42 @@ interface MachinesListProps {
  * This component shows a list of all machines and allows filtering on that list.
  */
 const MachinesList: React.FC<MachinesListProps> = ({ onError, onShowMachine, onReserveMachine }) => {
+  // shown machines
   const [machines, setMachines] = useState<Array<Machine>>(null);
+  // we keep the full list of machines, for filtering
+  const [allMachines, setAllMachines] = useState<Array<Machine>>(null);
 
+  // retrieve the full list of machines on component mount
   useEffect(() => {
     MachineAPI.index()
-      .then(data => setMachines(data))
+      .then(data => setAllMachines(data))
       .catch(e => onError(e));
   }, []);
 
+  // filter the machines shown when the full list was retrieved
+  useEffect(() => {
+    handleFilterByStatus(true);
+  }, [allMachines])
+
+  /**
+   * Callback triggered when the user changes the status filter.
+   * Set the 'machines' state to a filtered list, depending on the provided parameter.
+   */
+  const handleFilterByStatus = (status: boolean): void => {
+    if (!allMachines) return;
+    if (status === null) return setMachines(allMachines);
+
+    setMachines(allMachines.filter(m => m.disabled === !status));
+  }
+
   return (
     <div className="machines-list">
-      {machines && machines.map(machine => {
-        return <MachineCard key={machine.id} machine={machine} onShowMachine={onShowMachine} onReserveMachine={onReserveMachine} />
-      })}
+      <MachinesFilters onStatusSelected={handleFilterByStatus} />
+      <div className="all-machines">
+        {machines && machines.map(machine => {
+          return <MachineCard key={machine.id} machine={machine} onShowMachine={onShowMachine} onReserveMachine={onReserveMachine} />
+        })}
+      </div>
     </div>
   );
 }
diff --git a/app/frontend/src/stylesheets/application.scss b/app/frontend/src/stylesheets/application.scss
index 449a1f06f..47da23d36 100644
--- a/app/frontend/src/stylesheets/application.scss
+++ b/app/frontend/src/stylesheets/application.scss
@@ -52,5 +52,6 @@
 @import "modules/plan-categories/delete-plan-category";
 @import "modules/machines/machine-card";
 @import "modules/machines/machines-list";
+@import "modules/machines/machines-filters";
 
 @import "app.responsive";
diff --git a/app/frontend/src/stylesheets/modules/machines/machines-filters.scss b/app/frontend/src/stylesheets/modules/machines/machines-filters.scss
new file mode 100644
index 000000000..575b236cd
--- /dev/null
+++ b/app/frontend/src/stylesheets/modules/machines/machines-filters.scss
@@ -0,0 +1,31 @@
+.machines-filters {
+  margin: 1.5em;
+
+  .status-filter {
+    & {
+      display: inline-flex;
+      width: 50%;
+    }
+    & > label {
+      white-space: nowrap;
+      line-height: 2em;
+    }
+    & > * {
+      display: inline-block;
+    }
+    .status-select {
+      width: 100%;
+      margin-left: 10px;
+    }
+  }
+}
+
+@media screen and (max-width: 720px){
+  .machines-filters {
+    .status-filter {
+      padding-right: 0;
+      display: inline-block;
+      width: 100%;
+    }
+  }
+}
diff --git a/app/frontend/src/stylesheets/modules/machines/machines-list.scss b/app/frontend/src/stylesheets/modules/machines/machines-list.scss
index 833130b88..35b5d9c7c 100644
--- a/app/frontend/src/stylesheets/modules/machines/machines-list.scss
+++ b/app/frontend/src/stylesheets/modules/machines/machines-list.scss
@@ -1,4 +1,6 @@
 .machines-list {
-  display: flex;
-  flex-wrap: wrap;
+  .all-machines {
+    display: flex;
+    flex-wrap: wrap;
+  }
 }
diff --git a/config/locales/app.public.en.yml b/config/locales/app.public.en.yml
index ff82a9fa8..df10fabbc 100644
--- a/config/locales/app.public.en.yml
+++ b/config/locales/app.public.en.yml
@@ -210,6 +210,8 @@ en:
         new_availability: "Open reservations"
         book: "Book"
         _or_the_: " or the "
+      machines_filters:
+        show_machines: "Show machines"
         status_enabled: "Enabled"
         status_disabled: "Disabled"
         status_all: "All"