diff --git a/headlamp-sealed-secrets/src/components/SealedSecretDetail.tsx b/headlamp-sealed-secrets/src/components/SealedSecretDetail.tsx
index f619e04..06e33c4 100644
--- a/headlamp-sealed-secrets/src/components/SealedSecretDetail.tsx
+++ b/headlamp-sealed-secrets/src/components/SealedSecretDetail.tsx
@@ -74,6 +74,11 @@ export function SealedSecretDetail() {
     }
   }, [namespace]);
 
+  // Wait for required params before rendering
+  if (!namespace || !name) {
+    return <SealedSecretDetailSkeleton />;
+  }
+
   // Show error if fetch failed
   if (error) {
     return (
@@ -146,7 +151,7 @@ export function SealedSecretDetail() {
           },
         }}
       >
-        <Box>
+        <Box sx={{ height: '100%', overflow: 'auto' }}>
           <SectionBox
             title={
               <Box display="flex" alignItems="center" justifyContent="space-between">
diff --git a/headlamp-sealed-secrets/src/components/SettingsPage.tsx b/headlamp-sealed-secrets/src/components/SettingsPage.tsx
index 5f9ae2d..2f82626 100644
--- a/headlamp-sealed-secrets/src/components/SettingsPage.tsx
+++ b/headlamp-sealed-secrets/src/components/SettingsPage.tsx
@@ -4,7 +4,6 @@
  * Configuration page for the Sealed Secrets plugin
  */
 
-import { SectionBox } from '@kinvolk/headlamp-plugin/lib/CommonComponents';
 import { Box, Button, Divider, TextField, Typography } from '@mui/material';
 import { useSnackbar } from 'notistack';
 import React from 'react';
@@ -35,10 +34,7 @@ export function SettingsPage() {
   };
 
   return (
-    <SectionBox
-      title="Sealed Secrets Plugin Settings"
-    >
-      <Box p={3}>
+    <Box p={3}>
         <Typography variant="body1" paragraph id="settings-description">
           Configure the connection to your Sealed Secrets controller. These settings are stored in
           your browser's local storage.
@@ -156,6 +152,5 @@ export function SettingsPage() {
           </Typography>
         </Box>
       </Box>
-    </SectionBox>
   );
 }