diff --git a/packages/frontend/src/App.tsx b/packages/frontend/src/App.tsx
index b36f486..70751f4 100644
--- a/packages/frontend/src/App.tsx
+++ b/packages/frontend/src/App.tsx
@@ -83,6 +83,11 @@ const RekordboxReader: React.FC = () => {
     setSelectedSong(song);
   }, []);
 
+  // Handle closing the song details panel
+  const handleCloseSongDetails = useCallback(() => {
+    setSelectedSong(null);
+  }, []);
+
   // Handle playing a song from the main view
   const handlePlaySong = useCallback((song: Song) => {
     // Check if song has S3 file
@@ -685,7 +690,7 @@ const RekordboxReader: React.FC = () => {
                     </Box>
 
                     {/* Details Panel */}
-                    {!isMobile && (
+                    {!isMobile && selectedSong && (
                       <Box
                         w="350px"
                         minW="350px"
@@ -706,7 +711,7 @@ const RekordboxReader: React.FC = () => {
                           '&::-webkit-scrollbar-track': { backgroundColor: 'var(--chakra-colors-gray-900)' },
                         }}
                       >
-                        <SongDetails song={selectedSong} />
+                        <SongDetails song={selectedSong} onClose={handleCloseSongDetails} />
                       </Box>
                     )}
                   </Flex>
diff --git a/packages/frontend/src/components/SongDetails.tsx b/packages/frontend/src/components/SongDetails.tsx
index 14aa670..31844c2 100644
--- a/packages/frontend/src/components/SongDetails.tsx
+++ b/packages/frontend/src/components/SongDetails.tsx
@@ -1,10 +1,12 @@
 import React, { useMemo, memo } from "react";
-import { Box, VStack, Text, Divider } from "@chakra-ui/react";
+import { Box, VStack, Text, Divider, IconButton, HStack } from "@chakra-ui/react";
+import { CloseIcon } from "@chakra-ui/icons";
 import { Song } from "../types/interfaces";
 import { formatDuration } from '../utils/formatters';
 
 interface SongDetailsProps {
   song: Song | null;
+  onClose?: () => void;
 }
 
 const calculateBitrate = (size: string, totalTime: string): number | null => {
@@ -22,7 +24,7 @@ const calculateBitrate = (size: string, totalTime: string): number | null => {
   return Math.round(bits / seconds / 1000);
 };
 
-export const SongDetails: React.FC<SongDetailsProps> = memo(({ song }) => {
+export const SongDetails: React.FC<SongDetailsProps> = memo(({ song, onClose }) => {
   // Memoize expensive calculations
   const songDetails = useMemo(() => {
     if (!song) return null;
@@ -72,14 +74,27 @@ export const SongDetails: React.FC<SongDetailsProps> = memo(({ song }) => {
   return (
     <Box p={4} bg="gray.800" borderRadius="md">
       <VStack align="stretch" spacing={4}>
-        <Box>
-          <Text fontSize="lg" fontWeight="bold" color="white">
-            {song.title}
-          </Text>
-          <Text fontSize="md" color="gray.400">
-            {song.artist}
-          </Text>
-        </Box>
+        <HStack justify="space-between" align="flex-start">
+          <Box flex={1}>
+            <Text fontSize="lg" fontWeight="bold" color="white">
+              {song.title}
+            </Text>
+            <Text fontSize="md" color="gray.400">
+              {song.artist}
+            </Text>
+          </Box>
+          {onClose && (
+            <IconButton
+              size="sm"
+              variant="ghost"
+              icon={<CloseIcon />}
+              onClick={onClose}
+              aria-label="Close details"
+              color="gray.400"
+              _hover={{ bg: "gray.700", color: "white" }}
+            />
+          )}
+        </HStack>
         <Divider borderColor="gray.700" />
         <VStack align="stretch" spacing={3}>
           {songDetails.details.map(({ label, value }) => (