diff --git a/components/CardItem.js b/components/CardItem.js
index 51d33ba..1bfd0aa 100644
--- a/components/CardItem.js
+++ b/components/CardItem.js
@@ -1,4 +1,5 @@
 import { useState } from 'react';
+import { useRouter } from 'next/router';
 
 export default function CardItem({ 
   card, 
@@ -11,6 +12,7 @@ export default function CardItem({
   isFavorited = false
 }) {
   const [imageError, setImageError] = useState(false);
+  const router = useRouter();
 
   const handleSelectChange = (e) => {
     e.stopPropagation();
@@ -21,6 +23,14 @@ export default function CardItem({
     setImageError(true);
   };
 
+  const handleCardClick = (e) => {
+    // Don't navigate if clicking on interactive elements
+    if (e.target.closest('input, button, a')) {
+      return;
+    }
+    router.push(`/card/${card.id}`);
+  };
+
   // Get rarity-based styling
   const getRarityEffects = (rarity) => {
     const rarityLower = rarity?.toLowerCase() || '';
@@ -67,11 +77,14 @@ export default function CardItem({
 
   if (viewMode === 'list') {
     return (
-      <div className={`flex items-center p-4 border rounded-lg transition-all duration-200 ${
-        isSelected 
-          ? 'border-purple-500 bg-purple-50 shadow-md' 
-          : 'border-gray-200 hover:border-gray-300 hover:shadow-sm'
-      }`}>
+      <div 
+        className={`flex items-center p-4 border rounded-lg transition-all duration-200 cursor-pointer ${
+          isSelected 
+            ? 'border-purple-500 bg-purple-50 shadow-md' 
+            : 'border-gray-200 hover:border-gray-300 hover:shadow-sm'
+        }`}
+        onClick={handleCardClick}
+      >
         {/* Selection Checkbox */}
         <div className="flex-shrink-0 mr-4">
           <input
@@ -175,11 +188,14 @@ export default function CardItem({
       isSelected ? 'selected scale-105' : ''
     }`}>
       {/* Main Card Container */}
-      <div className={`relative bg-white rounded-xl border transition-all duration-300 overflow-hidden ${
-        isSelected 
-          ? 'border-purple-500 shadow-xl ring-2 ring-purple-200' 
-          : `${rarityEffects.border} group-hover:border-gray-300 group-hover:shadow-lg ${rarityEffects.shadow ? `shadow-lg ${rarityEffects.shadow}` : ''}`
-      } ${rarityEffects.glow}`}>
+      <div 
+        className={`relative bg-white rounded-xl border transition-all duration-300 overflow-hidden cursor-pointer ${
+          isSelected 
+            ? 'border-purple-500 shadow-xl ring-2 ring-purple-200' 
+            : `${rarityEffects.border} group-hover:border-gray-300 group-hover:shadow-lg ${rarityEffects.shadow ? `shadow-lg ${rarityEffects.shadow}` : ''}`
+        } ${rarityEffects.glow}`}
+        onClick={handleCardClick}
+      >
         
         {/* Rarity Particles */}
         {rarityEffects.particles && (
@@ -441,7 +457,7 @@ export default function CardItem({
                 <button
                   onClick={(e) => {
                     e.stopPropagation();
-                    window.open(`/card/${card.id}`, '_blank');
+                    router.push(`/card/${card.id}`);
                   }}
                   className="flex items-center justify-center p-2 bg-gray-100 dark:bg-gray-700 text-gray-700 dark:text-gray-300 rounded-lg hover:bg-gray-200 dark:hover:bg-gray-600 transition-colors"
                   title="View Details"