diff --git a/src/frontend/contexts/DraftObservationContext.tsx b/src/frontend/contexts/DraftObservationContext.tsx
index 4e1d3946b..5629a425e 100644
--- a/src/frontend/contexts/DraftObservationContext.tsx
+++ b/src/frontend/contexts/DraftObservationContext.tsx
@@ -4,11 +4,8 @@ import React, {
   useContext,
   useState,
 } from 'react';
-import {
-  DraftState,
-  createDraftObservationStore,
-} from '../hooks/persistedState/usePersistedDraftObservationNew';
-import {useStore} from 'zustand';
+
+import {createDraftObservationStore} from '../hooks/persistedState/usePersistedDraftObservationNew';
 
 const DraftObservationContext = createContext<ReturnType<
   typeof createDraftObservationStore
@@ -33,20 +30,3 @@ export function useDraftObservationContext() {
 
   return result;
 }
-
-function defaultSelector(state: DraftState) {
-  return state;
-}
-
-export function useDraftObservation<S = DraftState>(
-  selector: (state: DraftState) => S = defaultSelector as any,
-) {
-  const {store} = useDraftObservationContext();
-  const draftObservation = useStore(store, selector);
-  return draftObservation;
-}
-
-export function useDraftObservationActions() {
-  const {actions} = useDraftObservationContext();
-  return actions;
-}
diff --git a/src/frontend/hooks/draftObservation.ts b/src/frontend/hooks/draftObservation.ts
new file mode 100644
index 000000000..3b8af8de9
--- /dev/null
+++ b/src/frontend/hooks/draftObservation.ts
@@ -0,0 +1,21 @@
+import {useStore} from 'zustand';
+
+import {useDraftObservationContext} from '../contexts/DraftObservationContext';
+import {DraftState} from '../hooks/persistedState/usePersistedDraftObservationNew';
+
+function defaultSelector(state: DraftState) {
+  return state;
+}
+
+export function useDraftObservation<S = DraftState>(
+  selector: (state: DraftState) => S = defaultSelector as any,
+) {
+  const {store} = useDraftObservationContext();
+  const draftObservation = useStore(store, selector);
+  return draftObservation;
+}
+
+export function useDraftObservationActions() {
+  const {actions} = useDraftObservationContext();
+  return actions;
+}