diff --git a/catalog/CHANGELOG.md b/catalog/CHANGELOG.md
index b6d09c52751..25f09cb8347 100644
--- a/catalog/CHANGELOG.md
+++ b/catalog/CHANGELOG.md
@@ -17,6 +17,7 @@ where verb is one of
 
 ## Changes
 
+- [Fixed] Athena: fix minor UI bugs ([#4232](https://github.com/quiltdata/quilt/pull/4232))
 - [Fixed] Show Athena query editor when no named queries ([#4230](https://github.com/quiltdata/quilt/pull/4230))
 - [Fixed] Fix some doc URLs in catalog ([#4205](https://github.com/quiltdata/quilt/pull/4205))
 - [Changed] S3 Select -> GQL API calls for getting access counts ([#4218](https://github.com/quiltdata/quilt/pull/4218))
diff --git a/catalog/app/containers/Bucket/Queries/Athena/Database.tsx b/catalog/app/containers/Bucket/Queries/Athena/Database.tsx
index 7f73a8e36f6..990c27b68b1 100644
--- a/catalog/app/containers/Bucket/Queries/Athena/Database.tsx
+++ b/catalog/app/containers/Bucket/Queries/Athena/Database.tsx
@@ -205,15 +205,8 @@ const useStyles = M.makeStyles((t) => ({
     display: 'flex',
   },
   field: {
-    cursor: 'pointer',
     flexBasis: '50%',
     marginRight: t.spacing(2),
-    '& input': {
-      cursor: 'pointer',
-    },
-    '& > *': {
-      cursor: 'pointer',
-    },
   },
   button: {
     marginLeft: t.spacing(1),
diff --git a/catalog/app/containers/Bucket/Queries/Athena/History.tsx b/catalog/app/containers/Bucket/Queries/Athena/History.tsx
index 23de3ea9811..db8a869c3b6 100644
--- a/catalog/app/containers/Bucket/Queries/Athena/History.tsx
+++ b/catalog/app/containers/Bucket/Queries/Athena/History.tsx
@@ -277,6 +277,13 @@ export default function History({ bucket, executions, onLoadMore }: HistoryProps
   const { workgroup } = Model.use()
   if (!Model.hasValue(workgroup)) return null
 
+  if (!executions.length)
+    return (
+      <M.Paper>
+        <Empty />
+      </M.Paper>
+    )
+
   return (
     <>
       <M.Paper>
@@ -304,7 +311,6 @@ export default function History({ bucket, executions, onLoadMore }: HistoryProps
             />
           ),
         )}
-        {!executions.length && <Empty />}
         {(hasPagination || !!onLoadMore) && (
           <div className={classes.footer}>
             {hasPagination && (