diff --git a/frontend/src/Artist/Index/ArtistIndex.js b/frontend/src/Artist/Index/ArtistIndex.js
index de3f1a31a..4bfe3996f 100644
--- a/frontend/src/Artist/Index/ArtistIndex.js
+++ b/frontend/src/Artist/Index/ArtistIndex.js
@@ -216,7 +216,7 @@ class ArtistIndex extends Component {
 
     const ViewComponent = getViewComponent(view);
     const isLoaded = !error && isPopulated && !!items.length && contentBody;
-    const hasNoArtist = !items.length;
+    const hasNoArtist = !totalItems;
 
     return (
       <PageContent>
diff --git a/frontend/src/Components/Menu/MenuButton.css b/frontend/src/Components/Menu/MenuButton.css
index 184545a5f..38812cfb7 100644
--- a/frontend/src/Components/Menu/MenuButton.css
+++ b/frontend/src/Components/Menu/MenuButton.css
@@ -16,4 +16,6 @@
 
 .isDisabled {
   color: $disabledColor;
+
+  pointer-events: none;
 }