diff --git a/src/features/campaigns/components/ActivityList/index.tsx b/src/features/campaigns/components/ActivityList/index.tsx
index 4c9338562d..3fce406340 100644
--- a/src/features/campaigns/components/ActivityList/index.tsx
+++ b/src/features/campaigns/components/ActivityList/index.tsx
@@ -1,7 +1,7 @@
-import { FilterListOutlined } from '@mui/icons-material';
+import { FilterListOutlined, Pending } from '@mui/icons-material';
 import Fuse from 'fuse.js';
-import { useMemo } from 'react';
-import { Box, Card, Divider, Typography } from '@mui/material';
+import { useEffect, useMemo, useRef, useState } from 'react';
+import { Box, BoxProps, Card, Divider, Typography } from '@mui/material';
 
 import CallAssignmentListItem from './items/CallAssignmentListItem';
 import EmailListItem from './items/EmailListItem';
@@ -17,12 +17,61 @@ import useClusteredActivities, {
   CLUSTER_TYPE,
 } from 'features/campaigns/hooks/useClusteredActivities';
 import CanvassAssignmentListItem from './items/CanvassAssignmentListItem';
+import ActivityListItem, { STATUS_COLORS } from './items/ActivityListItem';
 
 interface ActivitiesProps {
   activities: CampaignActivity[];
   orgId: number;
 }
 
+interface LazyActivitiesBoxProps extends BoxProps {
+  index: number;
+}
+
+const LazyActivitiesBox = ({
+  index,
+  children,
+  ...props
+}: LazyActivitiesBoxProps) => {
+  const [inView, setInView] = useState(false);
+  const boxRef = useRef<HTMLElement>();
+
+  useEffect(() => {
+    if (!boxRef.current) {
+      return;
+    }
+
+    const observer = new IntersectionObserver((entries) => {
+      entries.forEach((entry) => {
+        if (entry.isIntersecting) {
+          setInView(true);
+        }
+      });
+    });
+
+    observer.observe(boxRef.current);
+  }, [boxRef]);
+
+  return inView ? (
+    <Box {...props}>
+      {index > 0 && <Divider />}
+      {children}
+    </Box>
+  ) : (
+    <Box ref={boxRef}>
+      {index > 0 && <Divider />}
+      <ActivityListItem
+        color={STATUS_COLORS.GRAY}
+        endNumber={0}
+        href={'#'}
+        PrimaryIcon={Pending}
+        SecondaryIcon={Pending}
+        title={'...'}
+      />
+    </Box>
+  );
+};
+
 const Activities = ({ activities, orgId }: ActivitiesProps) => {
   const clustered = useClusteredActivities(activities);
 
@@ -31,52 +80,52 @@ const Activities = ({ activities, orgId }: ActivitiesProps) => {
       {clustered.map((activity, index) => {
         if (activity.kind === ACTIVITIES.CALL_ASSIGNMENT) {
           return (
-            <Box key={`ca-${activity.data.id}`}>
-              {index > 0 && <Divider />}
+            <LazyActivitiesBox key={`ca-${activity.data.id}`} index={index}>
               <CallAssignmentListItem caId={activity.data.id} orgId={orgId} />
-            </Box>
+            </LazyActivitiesBox>
           );
         } else if (activity.kind == ACTIVITIES.CANVASS_ASSIGNMENT) {
           return (
-            <Box key={`canvassassignment-${activity.data.id}`}>
-              {index > 0 && <Divider />}
+            <LazyActivitiesBox
+              key={`canvassassignment-${activity.data.id}`}
+              index={index}
+            >
               <CanvassAssignmentListItem
                 caId={activity.data.id}
                 orgId={orgId}
               />
-            </Box>
+            </LazyActivitiesBox>
           );
         } else if (isEventCluster(activity)) {
           return (
-            <Box key={`event-${activity.events[0].id}`}>
-              {index > 0 && <Divider />}
+            <LazyActivitiesBox
+              key={`event-${activity.events[0].id}`}
+              index={index}
+            >
               {activity.kind == CLUSTER_TYPE.SINGLE ? (
                 <EventListItem cluster={activity} />
               ) : (
                 <EventClusterListItem cluster={activity} />
               )}
-            </Box>
+            </LazyActivitiesBox>
           );
         } else if (activity.kind === ACTIVITIES.SURVEY) {
           return (
-            <Box key={`survey-${activity.data.id}`}>
-              {index > 0 && <Divider />}
+            <LazyActivitiesBox key={`survey-${activity.data.id}`} index={index}>
               <SurveyListItem orgId={orgId} surveyId={activity.data.id} />
-            </Box>
+            </LazyActivitiesBox>
           );
         } else if (activity.kind === ACTIVITIES.TASK) {
           return (
-            <Box key={`task-${activity.data.id}`}>
-              {index > 0 && <Divider />}
+            <LazyActivitiesBox key={`task-${activity.data.id}`} index={index}>
               <TaskListItem orgId={orgId} taskId={activity.data.id} />
-            </Box>
+            </LazyActivitiesBox>
           );
         } else if (activity.kind === ACTIVITIES.EMAIL) {
           return (
-            <Box key={`email-${activity.data.id}`}>
-              {index > 0 && <Divider />}
+            <LazyActivitiesBox key={`email-${activity.data.id}`} index={index}>
               <EmailListItem emailId={activity.data.id} orgId={orgId} />
-            </Box>
+            </LazyActivitiesBox>
           );
         }
       })}
diff --git a/src/features/canvassAssignments/components/CanvassAssignmentMap.tsx b/src/features/canvassAssignments/components/CanvassAssignmentMap.tsx
index 30d0b17197..2b9be4158f 100644
--- a/src/features/canvassAssignments/components/CanvassAssignmentMap.tsx
+++ b/src/features/canvassAssignments/components/CanvassAssignmentMap.tsx
@@ -4,6 +4,8 @@ import {
   Map,
   FeatureGroup as FeatureGroupType,
   latLngBounds,
+  LatLngBounds,
+  LatLngTuple,
 } from 'leaflet';
 import { makeStyles } from '@mui/styles';
 import { GpsNotFixed } from '@mui/icons-material';
@@ -28,6 +30,7 @@ import MapControls from './MapControls';
 import objToLatLng from 'features/areas/utils/objToLatLng';
 import CanvassAssignmentMapOverlays from './CanvassAssignmentMapOverlays';
 import useAllPlaceVisits from '../hooks/useAllPlaceVisits';
+import useLocalStorage from 'zui/hooks/useLocalStorage';
 
 const useStyles = makeStyles(() => ({
   '@keyframes ghostMarkerBounce': {
@@ -85,6 +88,21 @@ const CanvassAssignmentMap: FC<CanvassAssignmentMapProps> = ({
   const crosshairRef = useRef<HTMLDivElement | null>(null);
   const reactFGref = useRef<FeatureGroupType | null>(null);
 
+  const [localStorageBounds, setLocalStorageBounds] = useLocalStorage<
+    [LatLngTuple, LatLngTuple] | null
+  >(`mapBounds-${assignment.id}`, null);
+
+  const saveBounds = () => {
+    const bounds = map?.getBounds();
+
+    if (bounds) {
+      setLocalStorageBounds([
+        [bounds.getSouth(), bounds.getWest()],
+        [bounds.getNorth(), bounds.getEast()],
+      ]);
+    }
+  };
+
   const [zoomed, setZoomed] = useState(false);
 
   const selectedPlace = places.find((place) => place.id == selectedPlaceId);
@@ -170,6 +188,10 @@ const CanvassAssignmentMap: FC<CanvassAssignmentMapProps> = ({
         updateSelection();
       });
 
+      map.on('moveend', saveBounds);
+
+      map.on('zoomend', () => saveBounds);
+
       return () => {
         map.off('move');
         map.off('moveend');
@@ -180,7 +202,10 @@ const CanvassAssignmentMap: FC<CanvassAssignmentMapProps> = ({
 
   useEffect(() => {
     if (map && !zoomed) {
-      const bounds = reactFGref.current?.getBounds();
+      const bounds = localStorageBounds
+        ? new LatLngBounds(localStorageBounds)
+        : reactFGref.current?.getBounds();
+
       if (bounds?.isValid()) {
         map.fitBounds(bounds);
         setZoomed(true);
diff --git a/src/features/canvassAssignments/components/MyCanvassAssignmentPage.tsx b/src/features/canvassAssignments/components/MyCanvassAssignmentPage.tsx
index 1ca8cd01b5..7ffebe87a0 100644
--- a/src/features/canvassAssignments/components/MyCanvassAssignmentPage.tsx
+++ b/src/features/canvassAssignments/components/MyCanvassAssignmentPage.tsx
@@ -107,7 +107,7 @@ const AssignmentPage: FC<{ assignment: AssignmentWithAreas }> = ({
               top: 0,
               transition: 'left 0.3s',
               width: '90vw',
-              zIndex: 9999,
+              zIndex: 99999,
             }}
           >
             <CanvasserSidebar assignment={assignment} />
diff --git a/src/features/canvassAssignments/components/PlaceDialog/index.tsx b/src/features/canvassAssignments/components/PlaceDialog/index.tsx
index fee629273d..550fe7169b 100644
--- a/src/features/canvassAssignments/components/PlaceDialog/index.tsx
+++ b/src/features/canvassAssignments/components/PlaceDialog/index.tsx
@@ -183,7 +183,6 @@ const PlaceDialog: FC<PlaceDialogProps> = ({
                 responses,
               });
               setShowSparkle(true);
-              back();
             }}
           />
         </Box>
diff --git a/src/features/canvassAssignments/components/PlaceDialog/pages/Place.tsx b/src/features/canvassAssignments/components/PlaceDialog/pages/Place.tsx
index 59dd242472..e6ea53053e 100644
--- a/src/features/canvassAssignments/components/PlaceDialog/pages/Place.tsx
+++ b/src/features/canvassAssignments/components/PlaceDialog/pages/Place.tsx
@@ -60,7 +60,6 @@ const Place: FC<PlaceProps> = ({
     <PageBase
       onClose={onClose}
       onEdit={onEdit}
-      subtitle={`${numVisitedHouseholds} / ${numHouseholds} households visited`}
       title={place.title || 'Untitled place'}
     >
       <Box>
@@ -72,6 +71,21 @@ const Place: FC<PlaceProps> = ({
           {place.description || 'Empty description'}
         </Typography>
       </Box>
+      <Box alignItems="center" display="flex" flexDirection="column" my={3}>
+        {!!numHouseholds && (
+          <>
+            <Typography variant="h4">
+              {`${numVisitedHouseholds} of ${numHouseholds}`}
+            </Typography>
+            <Typography variant="body2">households visited</Typography>
+          </>
+        )}
+        {!numHouseholds && (
+          <Typography variant="body2">
+            No households registered here yet
+          </Typography>
+        )}
+      </Box>
       <Box display="flex" gap={1} justifyContent="center" m={4}>
         {assignment.reporting_level == 'place' && (
           <Button onClick={onVisit} variant="contained">
@@ -92,10 +106,7 @@ const Place: FC<PlaceProps> = ({
               <Typography>History</Typography>
               <List>
                 {visits.map((visit) => {
-                  const householdsPerMetric = visit.responses.map((response) =>
-                    response.responseCounts.reduce((sum, value) => sum + value)
-                  );
-                  const households = Math.max(...householdsPerMetric);
+                  const households = estimateVisitedHouseholds(visit);
                   return (
                     <ListItem key={visit.id}>
                       <Box
diff --git a/src/features/canvassAssignments/components/PlaceDialog/pages/PlaceVisitPage.tsx b/src/features/canvassAssignments/components/PlaceDialog/pages/PlaceVisitPage.tsx
index 9a70669ee6..9229c8cdcf 100644
--- a/src/features/canvassAssignments/components/PlaceDialog/pages/PlaceVisitPage.tsx
+++ b/src/features/canvassAssignments/components/PlaceDialog/pages/PlaceVisitPage.tsx
@@ -76,6 +76,7 @@ const PlaceVisitPage: FC<Props> = ({
                 }))
               );
               setSubmitting(false);
+              onClose();
             }}
             startIcon={
               submitting ? (
diff --git a/src/features/canvassAssignments/hooks/useSidebarStats.ts b/src/features/canvassAssignments/hooks/useSidebarStats.ts
index 2b937f65f1..1665ae348b 100644
--- a/src/features/canvassAssignments/hooks/useSidebarStats.ts
+++ b/src/features/canvassAssignments/hooks/useSidebarStats.ts
@@ -1,6 +1,7 @@
 import { loadListIfNecessary } from 'core/caching/cacheUtils';
 import { useApiClient, useAppDispatch, useAppSelector } from 'core/hooks';
 import {
+  placesInvalidated,
   placesLoad,
   placesLoaded,
   visitsInvalidated,
@@ -8,6 +9,7 @@ import {
   visitsLoaded,
 } from '../store';
 import useMembership from 'features/organizations/hooks/useMembership';
+import estimateVisitedHouseholds from '../utils/estimateVisitedHouseholds';
 
 type UseSidebarReturn = {
   loading: boolean;
@@ -107,10 +109,7 @@ export default function useSidebarStats(
 
   if (visitListFuture.data) {
     visitListFuture.data.forEach((visit) => {
-      const householdsPerMetric = visit.responses.map((response) =>
-        response.responseCounts.reduce((sum, value) => sum + value, 0)
-      );
-      const numHouseholds = Math.max(...householdsPerMetric);
+      const numHouseholds = estimateVisitedHouseholds(visit);
 
       teamPlaces.add(visit.placeId);
       stats.allTime.numHouseholds += numHouseholds;
@@ -136,6 +135,7 @@ export default function useSidebarStats(
     stats,
     sync: () => {
       dispatch(visitsInvalidated(assignmentId));
+      dispatch(placesInvalidated());
     },
     synced: visitList?.loaded || null,
   };
diff --git a/src/features/canvassAssignments/store.ts b/src/features/canvassAssignments/store.ts
index c10e6097de..ec796b1d5c 100644
--- a/src/features/canvassAssignments/store.ts
+++ b/src/features/canvassAssignments/store.ts
@@ -256,6 +256,9 @@ const canvassAssignmentSlice = createSlice({
       item.data = place;
       item.loaded = new Date().toISOString();
     },
+    placesInvalidated: (state) => {
+      state.placeList.isStale = true;
+    },
     placesLoad: (state) => {
       state.placeList.isLoading = true;
     },
@@ -361,6 +364,7 @@ export const {
   canvassSessionsLoad,
   canvassSessionsLoaded,
   placeCreated,
+  placesInvalidated,
   placesLoad,
   placesLoaded,
   placeUpdated,
diff --git a/src/features/canvassAssignments/utils/estimateVisitedHouseholds.ts b/src/features/canvassAssignments/utils/estimateVisitedHouseholds.ts
index 73a9f68543..01dec098f0 100644
--- a/src/features/canvassAssignments/utils/estimateVisitedHouseholds.ts
+++ b/src/features/canvassAssignments/utils/estimateVisitedHouseholds.ts
@@ -6,5 +6,5 @@ export default function estimateVisitedHouseholds(
   const householdsPerMetric = visit.responses.map((response) =>
     response.responseCounts.reduce((sum, value) => sum + value)
   );
-  return Math.max(...householdsPerMetric);
+  return Math.max(0, ...householdsPerMetric);
 }
diff --git a/src/features/emails/components/EmailEditor/utils/InlineToolBase.ts b/src/features/emails/components/EmailEditor/utils/InlineToolBase.ts
index ede9562132..52132b7a58 100644
--- a/src/features/emails/components/EmailEditor/utils/InlineToolBase.ts
+++ b/src/features/emails/components/EmailEditor/utils/InlineToolBase.ts
@@ -1,8 +1,6 @@
 export default class InlineToolBase {
   private static _activeInstance: InlineToolBase | null = null;
 
-  private _handleSelectionChangeBound: () => void = () => undefined;
-
   activate() {
     if (InlineToolBase._activeInstance) {
       InlineToolBase._activeInstance.deactivate();
@@ -10,26 +8,19 @@ export default class InlineToolBase {
     InlineToolBase._activeInstance = this;
   }
 
-  checkState() {
+  checkState(selection: Selection) {
+    this.update(selection.getRangeAt(0));
     return true;
   }
 
   clear() {
     this.onToolClose();
-    this.destroy();
   }
 
   deactivate() {
     // Called by activate()
   }
 
-  destroy() {
-    document.removeEventListener(
-      'selectionchange',
-      this._handleSelectionChangeBound
-    );
-  }
-
   static get isInline() {
     return true;
   }
@@ -39,22 +30,6 @@ export default class InlineToolBase {
   }
 
   render() {
-    const handleSelectionChange = () => {
-      const selection = window.getSelection();
-      if (selection?.rangeCount) {
-        const range = window.getSelection()?.getRangeAt(0);
-        if (range) {
-          this.update(range);
-        }
-      }
-    };
-
-    this._handleSelectionChangeBound = handleSelectionChange.bind(this);
-    document.addEventListener(
-      'selectionchange',
-      this._handleSelectionChangeBound
-    );
-
     return this.renderButton();
   }
 
diff --git a/src/features/emails/utils/deliveryProblems.spec.ts b/src/features/emails/utils/deliveryProblems.spec.ts
index 17fc7a8a9d..9d57a81bda 100644
--- a/src/features/emails/utils/deliveryProblems.spec.ts
+++ b/src/features/emails/utils/deliveryProblems.spec.ts
@@ -1,17 +1,29 @@
 import deliveryProblems from './deliveryProblems';
 import { ZetkinEmail } from 'utils/types/zetkin';
-import { BLOCK_TYPES, DeliveryProblem } from '../types';
+import { BlockKind, DeliveryProblem, InlineNodeKind } from '../types';
 import { FILTER_TYPE, OPERATION } from 'features/smartSearch/components/types';
 
 const mockEmailContent = JSON.stringify({
   blocks: [
     {
       data: {
+        content: [
+          {
+            kind: InlineNodeKind.STRING,
+            value: 'Hello, ',
+          },
+          {
+            kind: InlineNodeKind.VARIABLE,
+            name: 'target.first_name',
+          },
+          {
+            kind: InlineNodeKind.STRING,
+            value: '!',
+          },
+        ],
         level: 1,
-        text: 'Hello <span contenteditable="false" style="background-color: rgba(0, 0, 0, 0.1); padding: 0.1em 0.5em; border-radius: 1em; display: inline-block;" data-slug="first_name">First name</span>!',
       },
-      id: 'afcJCL8gA8',
-      type: 'header',
+      kind: BlockKind.HEADER,
     },
   ],
 });
@@ -57,20 +69,39 @@ describe('deliveryProblems()', () => {
           blocks: [
             {
               data: {
+                //No button text
                 //Invalid url
-                text: `Welcome new member, <a href="blipblop">this is a link with an invalid url</a><br>`,
+                href: 'angela',
+                tag: '21232a5f',
               },
-              id: 'w09wrejf',
-              type: BLOCK_TYPES.PARAGRAPH,
+              kind: BlockKind.BUTTON,
             },
             {
               data: {
-                //No buttonText property
                 //Invalid url
-                url: 'angela',
+                content: [
+                  {
+                    kind: InlineNodeKind.STRING,
+                    value: 'Welcome, new member! ',
+                  },
+                  {
+                    content: [
+                      {
+                        kind: InlineNodeKind.STRING,
+                        value: 'This is a link with an invalid URL.',
+                      },
+                    ],
+                    href: 'blipblop',
+                    kind: InlineNodeKind.LINK,
+                    tag: '24712a5c',
+                  },
+                  {
+                    kind: InlineNodeKind.STRING,
+                    value: 'We look forward to meeting you soon!',
+                  },
+                ],
               },
-              id: 'sldkf8ew98',
-              type: BLOCK_TYPES.BUTTON,
+              kind: BlockKind.PARAGRAPH,
             },
           ],
         }),
diff --git a/src/features/emails/utils/deliveryProblems.ts b/src/features/emails/utils/deliveryProblems.ts
index d9996d5340..8fee860b95 100644
--- a/src/features/emails/utils/deliveryProblems.ts
+++ b/src/features/emails/utils/deliveryProblems.ts
@@ -1,8 +1,7 @@
-import { OutputData } from '@editorjs/editorjs';
-
 import blockProblems from '../components/EmailEditor/EmailSettings/utils/blockProblems';
-import { DeliveryProblem } from '../types';
+import { DeliveryProblem, EmailContent } from '../types';
 import { ZetkinEmail } from 'utils/types/zetkin';
+import zetkinBlocksToEditorjsBlocks from './zetkinBlocksToEditorjsBlocks';
 
 export default function deliveryProblems(
   email: ZetkinEmail
@@ -12,13 +11,14 @@ export default function deliveryProblems(
   if (!email.content) {
     problems.push(DeliveryProblem.EMPTY);
   } else {
-    const parsedContent: OutputData = JSON.parse(email.content);
+    const parsedContent: EmailContent = JSON.parse(email.content);
 
     if (parsedContent.blocks.length === 0) {
       problems.push(DeliveryProblem.EMPTY);
     }
+    const convertedBlocks = zetkinBlocksToEditorjsBlocks(parsedContent.blocks);
 
-    const hasProblems = parsedContent.blocks.some(
+    const hasProblems = convertedBlocks.some(
       (block) => !!blockProblems(block).length
     );
 
diff --git a/src/features/import/components/ImportDialog/Configure/Mapping/FieldSelect.tsx b/src/features/import/components/ImportDialog/Configure/Mapping/FieldSelect.tsx
index a04fd32561..a467c14526 100644
--- a/src/features/import/components/ImportDialog/Configure/Mapping/FieldSelect.tsx
+++ b/src/features/import/components/ImportDialog/Configure/Mapping/FieldSelect.tsx
@@ -53,12 +53,17 @@ const FieldSelect: FC<FieldSelectProps> = ({
 
   // This has to be a function, not a component with PascalCase. If it is used
   // as a component, the `Select` below won't recognise it as a valid option.
-  const listOption = ({ value, label, key }: Option & { key?: string }) => {
+  const listOption = ({
+    disabled,
+    value,
+    label,
+    key,
+  }: Option & { key?: string }) => {
     const alreadySelected = optionAlreadySelected(value);
     return (
       <MenuItem
         key={key}
-        disabled={alreadySelected}
+        disabled={alreadySelected || disabled}
         sx={{ paddingLeft: 4 }}
         value={value}
       >
@@ -132,11 +137,13 @@ const FieldSelect: FC<FieldSelectProps> = ({
         <Msg id={messageIds.configuration.mapping.zetkinFieldGroups.id} />
       </ListSubheader>
       {listOption({
+        disabled: false,
         label: messages.configuration.mapping.zetkinID(),
         value: 'id',
       })}
 
       {listOption({
+        disabled: false,
         label: messages.configuration.mapping.externalID(),
         value: 'ext_id',
       })}
@@ -152,10 +159,12 @@ const FieldSelect: FC<FieldSelectProps> = ({
         <Msg id={messageIds.configuration.mapping.zetkinFieldGroups.other} />
       </ListSubheader>
       {listOption({
+        disabled: false,
         label: messages.configuration.mapping.organization(),
         value: 'org',
       })}
       {listOption({
+        disabled: false,
         label: messages.configuration.mapping.tags(),
         value: 'tag',
       })}
diff --git a/src/features/import/hooks/useColumn.ts b/src/features/import/hooks/useColumn.ts
index a2aed25b07..16c9302d14 100644
--- a/src/features/import/hooks/useColumn.ts
+++ b/src/features/import/hooks/useColumn.ts
@@ -1,6 +1,7 @@
 import { columnUpdate } from '../store';
 import { CUSTOM_FIELD_TYPE } from 'utils/types/zetkin';
 import globalMessageIds from 'core/i18n/globalMessageIds';
+import messageIds from '../l10n/messageIds';
 import { NATIVE_PERSON_FIELDS } from 'features/views/components/types';
 import useCustomFields from 'features/profile/hooks/useCustomFields';
 import { useMessages } from 'core/i18n';
@@ -8,6 +9,7 @@ import { Column, ColumnKind } from '../utils/types';
 import { useAppDispatch, useAppSelector } from 'core/hooks';
 
 export interface Option {
+  disabled: boolean;
   value: string;
   label: string;
 }
@@ -17,6 +19,7 @@ export default function useColumn(orgId: number) {
   const pendingFile = useAppSelector((state) => state.import.pendingFile);
   const columns = pendingFile.sheets[pendingFile.selectedSheetIndex].columns;
   const globalMessages = useMessages(globalMessageIds);
+  const messages = useMessages(messageIds);
   const customFields = useCustomFields(orgId).data ?? [];
 
   const updateColumn = (index: number, column: Column) => {
@@ -56,32 +59,42 @@ export default function useColumn(orgId: number) {
   const nativeFieldsOptions: Option[] = Object.values(NATIVE_PERSON_FIELDS)
     .filter((fieldSlug) => fieldSlug != 'id' && fieldSlug != 'ext_id')
     .map((fieldSlug) => ({
+      disabled: false,
       label: globalMessages.personFields[fieldSlug](),
       value: `field:${fieldSlug}`,
     }));
 
-  const customFieldsOptions: Option[] = customFields
-    .filter(
-      (field) => field.organization.id == orgId || field.org_write == 'suborgs'
-    )
-    .map((field) => {
-      if (field.type === CUSTOM_FIELD_TYPE.DATE) {
-        return {
-          label: field.title,
-          value: `date:${field.slug}`,
-        };
-      } else if (field.type == CUSTOM_FIELD_TYPE.ENUM && field.enum_choices) {
-        return {
-          label: field.title,
-          value: `enum:${field.slug}`,
-        };
-      } else {
-        return {
-          label: field.title,
-          value: `field:${field.slug}`,
-        };
-      }
-    });
+  const customFieldsOptions: Option[] = customFields.map((field) => {
+    const belongsToCurrentOrg = field.organization.id == orgId;
+    const suborgsCanWrite = field.org_write == 'suborgs';
+    const currentOrgCanWrite = belongsToCurrentOrg || suborgsCanWrite;
+    const readOnly = !currentOrgCanWrite;
+    const label = readOnly
+      ? messages.configuration.mapping.messages.readOnlyField({
+          title: field.title,
+        })
+      : field.title;
+
+    if (field.type === CUSTOM_FIELD_TYPE.DATE) {
+      return {
+        disabled: readOnly,
+        label,
+        value: `date:${field.slug}`,
+      };
+    } else if (field.type == CUSTOM_FIELD_TYPE.ENUM && field.enum_choices) {
+      return {
+        disabled: readOnly,
+        label,
+        value: `enum:${field.slug}`,
+      };
+    } else {
+      return {
+        disabled: readOnly,
+        label,
+        value: `field:${field.slug}`,
+      };
+    }
+  });
 
   const fieldOptions: Option[] = [
     ...nativeFieldsOptions,
diff --git a/src/features/import/l10n/messageIds.ts b/src/features/import/l10n/messageIds.ts
index 12bf70ac88..67152d5df6 100644
--- a/src/features/import/l10n/messageIds.ts
+++ b/src/features/import/l10n/messageIds.ts
@@ -150,6 +150,7 @@ export default makeMessages('feat.import', {
         onlyEmpty: m<{ numEmpty: number }>(
           '{numEmpty, plural, =1 {one empty row} other {# empty rows}}.'
         ),
+        readOnlyField: m<{ title: string }>('{title} (read only)'),
 
         threeValuesAndEmpty: m<{
           firstValue: string | number;
diff --git a/src/features/smartSearch/components/SmartSearchDialog/FilterEditor.tsx b/src/features/smartSearch/components/SmartSearchDialog/FilterEditor.tsx
index 89d67b800e..35846f2dc3 100644
--- a/src/features/smartSearch/components/SmartSearchDialog/FilterEditor.tsx
+++ b/src/features/smartSearch/components/SmartSearchDialog/FilterEditor.tsx
@@ -4,6 +4,7 @@ import CampaignParticipation from '../filters/CampaignParticipation';
 import EmailBlacklist from '../filters/EmailBlacklist';
 import EmailClick from '../filters/EmailClick';
 import EmailHistory from '../filters/EmailHistory';
+import JoinFormFilter from '../filters/JoinForm';
 import Journey from '../filters/Journey';
 import MostActive from '../filters/MostActive';
 import PersonData from '../filters/PersonData';
@@ -166,6 +167,13 @@ const FilterEditor = ({
           onSubmit={onSubmitFilter}
         />
       )}
+      {filter.type === FILTER_TYPE.JOINFORM && (
+        <JoinFormFilter
+          filter={filter}
+          onCancel={onCancelSubmitFilter}
+          onSubmit={onSubmitFilter}
+        />
+      )}
       {filter.type === FILTER_TYPE.JOURNEY && (
         <Journey
           filter={filter}
diff --git a/src/features/smartSearch/components/SmartSearchDialog/FilterGallery/filterGalleryPattern.ts b/src/features/smartSearch/components/SmartSearchDialog/FilterGallery/filterGalleryPattern.ts
index 42ba328c7c..8fa0fc444a 100644
--- a/src/features/smartSearch/components/SmartSearchDialog/FilterGallery/filterGalleryPattern.ts
+++ b/src/features/smartSearch/components/SmartSearchDialog/FilterGallery/filterGalleryPattern.ts
@@ -123,10 +123,10 @@ export default function filterGalleryPattern(
     pattern = PATTERN_TEMPLATES.pattern15;
   }
 
-  pattern.background = pattern.background.replaceAll(
-    '$strongColor',
-    colors.strong
-  );
-  pattern.background = pattern.background.replaceAll('$paleColor', colors.pale);
-  return pattern;
+  return {
+    ...pattern,
+    background: pattern.background
+      .replaceAll('$strongColor', colors.strong)
+      .replaceAll('$paleColor', colors.pale),
+  };
 }
diff --git a/src/features/smartSearch/components/SmartSearchDialog/FilterGallery/groupedFilters.ts b/src/features/smartSearch/components/SmartSearchDialog/FilterGallery/groupedFilters.ts
index 490dc9174f..1595d8fcf8 100644
--- a/src/features/smartSearch/components/SmartSearchDialog/FilterGallery/groupedFilters.ts
+++ b/src/features/smartSearch/components/SmartSearchDialog/FilterGallery/groupedFilters.ts
@@ -82,6 +82,6 @@ export const GROUPED_FILTERS: {
       pale: filterCategoryColors.red.pale,
       strong: filterCategoryColors.red.strong,
     },
-    filters: [FILTER_TYPE.RANDOM, FILTER_TYPE.USER],
+    filters: [FILTER_TYPE.JOINFORM, FILTER_TYPE.RANDOM, FILTER_TYPE.USER],
   },
 };
diff --git a/src/features/smartSearch/components/SmartSearchDialog/QueryOverview/getFilterComponents.tsx b/src/features/smartSearch/components/SmartSearchDialog/QueryOverview/getFilterComponents.tsx
index 630986328d..68792ca9d8 100644
--- a/src/features/smartSearch/components/SmartSearchDialog/QueryOverview/getFilterComponents.tsx
+++ b/src/features/smartSearch/components/SmartSearchDialog/QueryOverview/getFilterComponents.tsx
@@ -6,6 +6,7 @@ import {
   Block,
   Call,
   CheckBoxOutlined,
+  DoorFrontOutlined,
   DraftsOutlined,
   Event,
   ExploreOutlined,
@@ -50,6 +51,7 @@ import {
   EmailClickFilterConfig,
   EmailHistoryFilterConfig,
   FILTER_TYPE,
+  JoinFormFilterConfig,
   JourneyFilterConfig,
   MostActiveFilterConfig,
   OPERATION,
@@ -66,6 +68,7 @@ import {
   TaskFilterConfig,
   UserFilterConfig,
 } from 'features/smartSearch/components/types';
+import DisplayJoinForm from '../../filters/JoinForm/DisplayJoinForm';
 
 export default function getFilterComponents(
   filter: SmartSearchFilterWithId<AnyFilterConfig>
@@ -219,6 +222,13 @@ export default function getFilterComponents(
     filterTypeIcon = (
       <AccountCircleOutlined color="secondary" fontSize="small" />
     );
+  } else if (filter.type == FILTER_TYPE.JOINFORM) {
+    displayFilter = (
+      <DisplayJoinForm
+        filter={filter as SmartSearchFilterWithId<JoinFormFilterConfig>}
+      />
+    );
+    filterTypeIcon = <DoorFrontOutlined color="secondary" fontSize="small" />;
   }
 
   return {
diff --git a/src/features/smartSearch/components/filters/JoinForm/DisplayJoinForm.tsx b/src/features/smartSearch/components/filters/JoinForm/DisplayJoinForm.tsx
new file mode 100644
index 0000000000..d2537f222d
--- /dev/null
+++ b/src/features/smartSearch/components/filters/JoinForm/DisplayJoinForm.tsx
@@ -0,0 +1,46 @@
+import { FC } from 'react';
+
+import {
+  JoinFormFilterConfig,
+  OPERATION,
+  SmartSearchFilterWithId,
+} from '../../types';
+import { Msg } from 'core/i18n';
+import messageIds from 'features/smartSearch/l10n/messageIds';
+import UnderlinedMsg from '../../UnderlinedMsg';
+import { useNumericRouteParams } from 'core/hooks';
+import DisplayJoinFormTitle from './DisplayJoinFormTitle';
+import DisplayTimeFrame from '../DisplayTimeFrame';
+import { getTimeFrameWithConfig } from '../../utils';
+
+type Props = {
+  filter: SmartSearchFilterWithId<JoinFormFilterConfig>;
+};
+
+const localMessageIds = messageIds.filters.joinForm;
+
+const DisplayJoinForm: FC<Props> = ({ filter }) => {
+  const { orgId } = useNumericRouteParams();
+  const op = filter.op || OPERATION.ADD;
+  const timeFrame = getTimeFrameWithConfig({
+    after: filter.config.submitted?.after,
+    before: filter.config.submitted?.before,
+  });
+
+  return (
+    <Msg
+      id={localMessageIds.inputString}
+      values={{
+        addRemoveSelect: <UnderlinedMsg id={messageIds.operators[op]} />,
+        formSelect: filter.config.form ? (
+          <DisplayJoinFormTitle formId={filter.config.form} orgId={orgId} />
+        ) : (
+          <UnderlinedMsg id={localMessageIds.anyForm} />
+        ),
+        timeFrame: <DisplayTimeFrame config={timeFrame} />,
+      }}
+    />
+  );
+};
+
+export default DisplayJoinForm;
diff --git a/src/features/smartSearch/components/filters/JoinForm/DisplayJoinFormTitle.tsx b/src/features/smartSearch/components/filters/JoinForm/DisplayJoinFormTitle.tsx
new file mode 100644
index 0000000000..3f3966620b
--- /dev/null
+++ b/src/features/smartSearch/components/filters/JoinForm/DisplayJoinFormTitle.tsx
@@ -0,0 +1,25 @@
+import { FC } from 'react';
+
+import messageIds from 'features/smartSearch/l10n/messageIds';
+import useJoinForm from 'features/joinForms/hooks/useJoinForm';
+import UnderlinedMsg from '../../UnderlinedMsg';
+
+type Props = {
+  formId: number;
+  orgId: number;
+};
+
+const localMessageIds = messageIds.filters.joinForm;
+
+const DisplayJoinFormTitle: FC<Props> = ({ formId, orgId }) => {
+  const { data } = useJoinForm(orgId, formId);
+
+  return (
+    <UnderlinedMsg
+      id={localMessageIds.form}
+      values={{ title: data?.title || '' }}
+    />
+  );
+};
+
+export default DisplayJoinFormTitle;
diff --git a/src/features/smartSearch/components/filters/JoinForm/index.tsx b/src/features/smartSearch/components/filters/JoinForm/index.tsx
new file mode 100644
index 0000000000..c451b7e98f
--- /dev/null
+++ b/src/features/smartSearch/components/filters/JoinForm/index.tsx
@@ -0,0 +1,116 @@
+import { FC, FormEvent } from 'react';
+import { MenuItem } from '@mui/material';
+
+import {
+  JoinFormFilterConfig,
+  NewSmartSearchFilter,
+  OPERATION,
+  SmartSearchFilterWithId,
+  TIME_FRAME,
+  ZetkinSmartSearchFilter,
+} from '../../types';
+import FilterForm from '../../FilterForm';
+import { Msg } from 'core/i18n';
+import messageIds from 'features/smartSearch/l10n/messageIds';
+import StyledSelect from '../../inputs/StyledSelect';
+import useSmartSearchFilter from 'features/smartSearch/hooks/useSmartSearchFilter';
+import TimeFrame from '../TimeFrame';
+import useJoinForms from 'features/joinForms/hooks/useJoinForms';
+import { useNumericRouteParams } from 'core/hooks';
+
+type Props = {
+  filter: SmartSearchFilterWithId<JoinFormFilterConfig> | NewSmartSearchFilter;
+  onCancel: () => void;
+  onSubmit: (
+    filter:
+      | SmartSearchFilterWithId<JoinFormFilterConfig>
+      | ZetkinSmartSearchFilter<JoinFormFilterConfig>
+  ) => void;
+};
+
+const localMessageIds = messageIds.filters.joinForm;
+
+const JoinFormFilter: FC<Props> = ({
+  filter: initialFilter,
+  onSubmit,
+  onCancel,
+}) => {
+  const { orgId } = useNumericRouteParams();
+  const forms = useJoinForms(orgId).data || [];
+  const { filter, setConfig, setOp } =
+    useSmartSearchFilter<JoinFormFilterConfig>(initialFilter, {});
+
+  const handleSubmit = (e: FormEvent) => {
+    e.preventDefault();
+    onSubmit(filter);
+  };
+
+  return (
+    <FilterForm
+      onCancel={onCancel}
+      onSubmit={handleSubmit}
+      renderSentence={() => (
+        <Msg
+          id={localMessageIds.inputString}
+          values={{
+            addRemoveSelect: (
+              <StyledSelect
+                onChange={(e) => setOp(e.target.value as OPERATION)}
+                value={filter.op}
+              >
+                {Object.values(OPERATION).map((o) => (
+                  <MenuItem key={o} value={o}>
+                    <Msg id={messageIds.operators[o]} />
+                  </MenuItem>
+                ))}
+              </StyledSelect>
+            ),
+            formSelect: (
+              <StyledSelect
+                onChange={(e) => {
+                  const formId = parseInt(e.target.value);
+                  const config = { ...filter.config };
+                  if (formId) {
+                    config.form = formId;
+                  } else {
+                    delete config.form;
+                  }
+
+                  setConfig(config);
+                }}
+                value={filter.config.form || 'any'}
+              >
+                <MenuItem value="any">
+                  <Msg id={localMessageIds.anyForm} />
+                </MenuItem>
+                {forms.map((form) => (
+                  <MenuItem key={form.id} value={form.id}>
+                    {form.title}
+                  </MenuItem>
+                ))}
+              </StyledSelect>
+            ),
+            timeFrame: (
+              <TimeFrame
+                filterConfig={filter.config.submitted || {}}
+                onChange={(range) =>
+                  setConfig({ ...filter.config, submitted: range })
+                }
+                options={[
+                  TIME_FRAME.AFTER_DATE,
+                  TIME_FRAME.BEFORE_DATE,
+                  TIME_FRAME.BEFORE_TODAY,
+                  TIME_FRAME.BETWEEN,
+                  TIME_FRAME.EVER,
+                  TIME_FRAME.LAST_FEW_DAYS,
+                ]}
+              />
+            ),
+          }}
+        />
+      )}
+    />
+  );
+};
+
+export default JoinFormFilter;
diff --git a/src/features/smartSearch/components/types.ts b/src/features/smartSearch/components/types.ts
index c8ca8dad51..8e5ae107a1 100644
--- a/src/features/smartSearch/components/types.ts
+++ b/src/features/smartSearch/components/types.ts
@@ -20,6 +20,7 @@ export enum FILTER_TYPE {
   EMAIL_BLACKLIST = 'email_blacklist',
   EMAIL_CLICK = 'email_click',
   EMAIL_HISTORY = 'email_history',
+  JOINFORM = 'joinform',
   JOURNEY = 'journey_subjects',
   MOST_ACTIVE = 'most_active',
   PERSON_DATA = 'person_data',
@@ -160,6 +161,15 @@ export interface EmailHistoryFilterConfig {
   email?: number;
   operator: 'sent' | 'not_sent' | 'opened' | 'not_opened';
 }
+
+export interface JoinFormFilterConfig {
+  form?: number;
+  submitted?: {
+    after?: string;
+    before?: string;
+  };
+}
+
 export interface MostActiveFilterConfig {
   after?: string;
   before?: string;
@@ -325,6 +335,7 @@ export type AnyFilterConfig =
   | CampaignParticipationConfig
   | DefaultFilterConfig
   | EmailBlacklistFilterConfig
+  | JoinFormFilterConfig
   | MostActiveFilterConfig
   | PersonDataFilterConfig
   | PersonFieldFilterConfig
diff --git a/src/features/smartSearch/l10n/messageIds.ts b/src/features/smartSearch/l10n/messageIds.ts
index d3f095ddfa..c0f4d9c0cc 100644
--- a/src/features/smartSearch/l10n/messageIds.ts
+++ b/src/features/smartSearch/l10n/messageIds.ts
@@ -75,6 +75,10 @@ export default makeMessages('feat.smartSearch', {
         description: m('Who was sent what, when?'),
         title: m('Based on their email history'),
       },
+      joinform: {
+        description: m('Find people who came in through a join form.'),
+        title: m('Based on join form source'),
+      },
       journey_subjects: {
         description: m(
           'Find people who are on a journey or finished it already'
@@ -301,6 +305,17 @@ export default makeMessages('feat.smartSearch', {
         sent: m('been sent'),
       },
     },
+    joinForm: {
+      anyForm: m('any join form'),
+      form: m<{ title: string }>('"{title}"'),
+      inputString: m<{
+        addRemoveSelect: ReactElement;
+        formSelect: ReactElement;
+        timeFrame: ReactElement;
+      }>(
+        '{addRemoveSelect} people who came in through {formSelect} {timeFrame}'
+      ),
+    },
     journey: {
       condition: {
         conditionSelect: {
diff --git a/src/features/views/components/ViewDataTable/columnTypes/OrganizerActionColumnType.tsx b/src/features/views/components/ViewDataTable/columnTypes/OrganizerActionColumnType.tsx
index a3dde39574..a367646248 100644
--- a/src/features/views/components/ViewDataTable/columnTypes/OrganizerActionColumnType.tsx
+++ b/src/features/views/components/ViewDataTable/columnTypes/OrganizerActionColumnType.tsx
@@ -23,6 +23,7 @@ import { ZetkinOrganizerAction } from 'utils/types/zetkin';
 import { ZetkinViewRow } from '../../types';
 import ZUIRelativeTime from 'zui/ZUIRelativeTime';
 import messageIds from 'features/views/l10n/messageIds';
+import useToggleDebounce from 'utils/hooks/useToggleDebounce';
 
 type OrganizerActionViewCell = null | ZetkinOrganizerAction[];
 
@@ -83,6 +84,10 @@ const Cell: FC<{
   const viewId = parseInt(query.viewId as string);
   const [anchorEl, setAnchorEl] = useState<HTMLElement | null>(null);
   const { openPane } = usePanes();
+  const { open: openPopper, close: closePopper } = useToggleDebounce(
+    (ev) => setAnchorEl(ev.currentTarget),
+    () => setAnchorEl(null)
+  );
 
   const [isRestricted] = useAccessLevel();
   const numUnsolved =
@@ -96,8 +101,8 @@ const Cell: FC<{
     return (
       <Box
         className={styles.organizerActionContainer}
-        onMouseOut={() => setAnchorEl(null)}
-        onMouseOver={(ev) => setAnchorEl(ev.currentTarget)}
+        onMouseOut={closePopper}
+        onMouseOver={openPopper}
       >
         {numUnsolved < 1 ? (
           <Check />
diff --git a/src/features/views/components/ViewDataTable/columnTypes/SurveyOptionColumnType.tsx b/src/features/views/components/ViewDataTable/columnTypes/SurveyOptionColumnType.tsx
index d6740438f6..5c8bc67816 100644
--- a/src/features/views/components/ViewDataTable/columnTypes/SurveyOptionColumnType.tsx
+++ b/src/features/views/components/ViewDataTable/columnTypes/SurveyOptionColumnType.tsx
@@ -12,6 +12,7 @@ import theme from '../../../../../theme';
 import { usePanes } from 'utils/panes';
 import ViewSurveySubmissionPreview from '../../ViewSurveySubmissionPreview';
 import messageIds from 'features/views/l10n/messageIds';
+import useToggleDebounce from 'utils/hooks/useToggleDebounce';
 
 type SurveyOptionViewCell =
   | {
@@ -48,6 +49,10 @@ const Cell: FC<{ cell: SurveyOptionViewCell }> = ({ cell }) => {
   const [anchorEl, setAnchorEl] = useState<HTMLElement | null>(null);
   const { openPane } = usePanes();
   const { orgId } = useRouter().query;
+  const { open: openPopper, close: closePopper } = useToggleDebounce(
+    (ev) => setAnchorEl(ev.currentTarget),
+    () => setAnchorEl(null)
+  );
 
   if (!cell?.length) {
     return null;
@@ -75,8 +80,8 @@ const Cell: FC<{ cell: SurveyOptionViewCell }> = ({ cell }) => {
       display="flex"
       height="100%"
       justifyContent="center"
-      onMouseOut={() => setAnchorEl(null)}
-      onMouseOver={(ev) => setAnchorEl(ev.currentTarget)}
+      onMouseOut={closePopper}
+      onMouseOver={openPopper}
       width="100%"
     >
       {mostRecent.selected ? (
diff --git a/src/features/views/components/ViewDataTable/columnTypes/SurveyOptionsColumnType.tsx b/src/features/views/components/ViewDataTable/columnTypes/SurveyOptionsColumnType.tsx
index 1c72296a52..83419110c2 100644
--- a/src/features/views/components/ViewDataTable/columnTypes/SurveyOptionsColumnType.tsx
+++ b/src/features/views/components/ViewDataTable/columnTypes/SurveyOptionsColumnType.tsx
@@ -14,6 +14,7 @@ import { usePanes } from 'utils/panes';
 import { IColumnType } from '.';
 import SurveySubmissionPane from 'features/surveys/panes/SurveySubmissionPane';
 import ViewSurveySubmissionPreview from '../../ViewSurveySubmissionPreview';
+import useToggleDebounce from 'utils/hooks/useToggleDebounce';
 
 export type SurveyOptionsViewCell =
   | {
@@ -94,6 +95,10 @@ const Cell: FC<{
   const styles = useStyles();
   const [anchorEl, setAnchorEl] = useState<HTMLElement | null>(null);
   const { openPane } = usePanes();
+  const { open: openPopper, close: closePopper } = useToggleDebounce(
+    (ev) => setAnchorEl(ev.currentTarget),
+    () => setAnchorEl(null)
+  );
 
   if (!cell?.length) {
     return null;
@@ -108,8 +113,8 @@ const Cell: FC<{
   return (
     <Box
       className={styles.cell}
-      onMouseOut={() => setAnchorEl(null)}
-      onMouseOver={(ev) => setAnchorEl(ev.currentTarget)}
+      onMouseOut={closePopper}
+      onMouseOver={openPopper}
     >
       <Box className={styles.content}>
         {sorted[0].selected.map((s) => (
diff --git a/src/features/views/components/ViewDataTable/columnTypes/SurveyResponseColumnType.tsx b/src/features/views/components/ViewDataTable/columnTypes/SurveyResponseColumnType.tsx
index d87f20900c..6ead3671d8 100644
--- a/src/features/views/components/ViewDataTable/columnTypes/SurveyResponseColumnType.tsx
+++ b/src/features/views/components/ViewDataTable/columnTypes/SurveyResponseColumnType.tsx
@@ -15,6 +15,7 @@ import { SurveyResponseViewColumn } from '../../types';
 import SurveySubmissionPane from 'features/surveys/panes/SurveySubmissionPane';
 import { usePanes } from 'utils/panes';
 import ViewSurveySubmissionPreview from '../../ViewSurveySubmissionPreview';
+import useToggleDebounce from 'utils/hooks/useToggleDebounce';
 
 export type SurveyResponseViewCell = {
   submission_id: number;
@@ -71,6 +72,10 @@ const Cell: FC<{ cell: SurveyResponseViewCell | undefined }> = ({ cell }) => {
   const styles = useStyles();
   const [anchorEl, setAnchorEl] = useState<HTMLElement | null>(null);
   const { openPane } = usePanes();
+  const { open: openPopper, close: closePopper } = useToggleDebounce(
+    (ev) => setAnchorEl(ev.currentTarget),
+    () => setAnchorEl(null)
+  );
 
   if (!cell?.length) {
     return null;
@@ -81,13 +86,12 @@ const Cell: FC<{ cell: SurveyResponseViewCell | undefined }> = ({ cell }) => {
     const d1 = new Date(sub1.submitted);
     return d1.getTime() - d0.getTime();
   });
-
   return (
     <Box className={styles.cell}>
       <Box
         className={styles.content}
-        onMouseOut={() => setAnchorEl(null)}
-        onMouseOver={(ev) => setAnchorEl(ev.currentTarget)}
+        onMouseOut={closePopper}
+        onMouseOver={openPopper}
       >
         <Box alignItems="center" display="flex" justifyContent="space-between">
           {sorted[0].text}
diff --git a/src/features/views/l10n/messageIds.ts b/src/features/views/l10n/messageIds.ts
index a98f2e310c..1d0fcadb70 100644
--- a/src/features/views/l10n/messageIds.ts
+++ b/src/features/views/l10n/messageIds.ts
@@ -419,7 +419,14 @@ export default makeMessages('feat.views', {
       delete: m('Delete list'),
       editQuery: m('Edit Smart Search query'),
       makeDynamic: m('Convert to Smart Search list'),
-      makeStatic: m('Convert to static list'),
+      makeStatic: {
+        confirmDialogInfo: m(
+          'If you convert this list to a static list the Smart Search will be removed and all the people the Smart Search returned will no longer be there.'
+        ),
+        confirmDialogSubmitLabel: m('Convert'),
+        confirmDialogTitle: m('Convert to static list'),
+        label: m('Convert to static list'),
+      },
     },
     jumpMenu: {
       placeholder: m('Start typing to find list'),
diff --git a/src/features/views/layout/SingleViewLayout.tsx b/src/features/views/layout/SingleViewLayout.tsx
index b664d4a9c8..06da3cf130 100644
--- a/src/features/views/layout/SingleViewLayout.tsx
+++ b/src/features/views/layout/SingleViewLayout.tsx
@@ -102,9 +102,15 @@ const SingleViewLayout: FunctionComponent<SingleViewLayoutProps> = ({
       onSelect: () => setQueryDialogOpen(true),
     });
     ellipsisMenu.push({
-      label: messages.viewLayout.ellipsisMenu.makeStatic(),
+      label: messages.viewLayout.ellipsisMenu.makeStatic.label(),
       onSelect: () => {
-        deleteContentQuery();
+        showConfirmDialog({
+          onSubmit: deleteContentQuery,
+          title:
+            messages.viewLayout.ellipsisMenu.makeStatic.confirmDialogTitle(),
+          warningText:
+            messages.viewLayout.ellipsisMenu.makeStatic.confirmDialogInfo(),
+        });
       },
     });
   } else {
diff --git a/src/utils/hooks/useToggleDebounce.ts b/src/utils/hooks/useToggleDebounce.ts
new file mode 100644
index 0000000000..9ec77e217b
--- /dev/null
+++ b/src/utils/hooks/useToggleDebounce.ts
@@ -0,0 +1,22 @@
+import { MouseEvent, useRef } from 'react';
+
+// Close will be called after a delay, which is cancelled if open is called
+// Useful to toggle poppers without closing the instant the cursor is outside the triggering element
+export default function useToggleDebounce(
+  open: (ev: MouseEvent<HTMLElement>) => void,
+  close: (ev: MouseEvent<HTMLElement>) => void,
+  delay = 250
+) {
+  const timeoutId = useRef<number | undefined>();
+  function openDebounced(ev: MouseEvent<HTMLElement>) {
+    clearTimeout(timeoutId.current);
+    open(ev);
+  }
+
+  function closeDebounced(ev: MouseEvent<HTMLElement>) {
+    timeoutId.current = window.setTimeout(() => {
+      close(ev);
+    }, delay);
+  }
+  return { close: closeDebounced, open: openDebounced };
+}