diff --git a/src/components/Button.tsx b/src/components/Button.tsx
index c1727135..91f9d46c 100644
--- a/src/components/Button.tsx
+++ b/src/components/Button.tsx
@@ -20,14 +20,14 @@ const Button = ({
 }: ButtonProps) => {
   return as === "button" ? (
     <button
-      className={`button ${isIcon ? "button--icon" : ""} ${className}`}
+      className={`button ${isIcon ? "button--icon" : ""} ${className || ""}`}
       onClick={onClick}
       {...props}
     >
       {children}
     </button>
   ) : (
-    <a className={`button ${className}`} href={href} {...props}>
+    <a className={`button ${className || ""}`} href={href} {...props}>
       {children}
     </a>
   );
diff --git a/src/components/CategoryList.tsx b/src/components/CategoryList.tsx
index c1dd91d3..b0a75592 100644
--- a/src/components/CategoryList.tsx
+++ b/src/components/CategoryList.tsx
@@ -7,8 +7,8 @@ const CategoryList = () => {
 
   return (
     <ul role="list" className="categories">
-      {fetchedCategories.map((name) => (
-        <li className="category">
+      {fetchedCategories.map((name, idx) => (
+        <li key={idx} className="category">
           <button
             className={`category__btn ${
               name === category ? "category__btn--active" : ""
diff --git a/src/components/CopyToClipboard.tsx b/src/components/CopyToClipboard.tsx
new file mode 100644
index 00000000..ce5ca3b4
--- /dev/null
+++ b/src/components/CopyToClipboard.tsx
@@ -0,0 +1,29 @@
+import { useState } from "react";
+import { useAppContext } from "../contexts/AppContext";
+import Button from "./Button";
+import { CopyIcon } from "./Icons";
+
+const CopyToClipboard = ({ ...props }) => {
+  const { snippet } = useAppContext();
+  const [isCopied, setIsCopied] = useState(false);
+
+  const snippetCode = snippet ? snippet.code : "";
+
+  const copySnippetCode = () => {
+    navigator.clipboard
+      .writeText(snippetCode)
+      .then(() => {
+        setIsCopied(true);
+        setTimeout(() => setIsCopied(false), 2000);
+      })
+      .catch((err) => alert("Error occured: " + err));
+  };
+
+  return (
+    <Button isIcon={true} onClick={copySnippetCode} {...props}>
+      {isCopied ? "Copied!" : <CopyIcon />}
+    </Button>
+  );
+};
+
+export default CopyToClipboard;
diff --git a/src/components/Logo.tsx b/src/components/Logo.tsx
index 37c1a767..c1ae316a 100644
--- a/src/components/Logo.tsx
+++ b/src/components/Logo.tsx
@@ -1,4 +1,3 @@
-import { Link } from "react-router-dom";
 import { LogoIcon } from "./Icons";
 
 const Logo = () => {
diff --git a/src/components/SnippetList.tsx b/src/components/SnippetList.tsx
index 874d81e8..8186f4a6 100644
--- a/src/components/SnippetList.tsx
+++ b/src/components/SnippetList.tsx
@@ -1,31 +1,81 @@
+import { useState } from "react";
+import { SnippetType } from "../types";
 import { useAppContext } from "../contexts/AppContext";
 import { useSnippets } from "../hooks/useSnippets";
+import slugify from "../utils/slugify";
+
 import Button from "./Button";
-import { CopyIcon, ExpandIcon } from "./Icons";
+import CodePreview from "./CodePreview";
+import SnippetModal from "./SnippetModal";
+import CopyToClipboard from "./CopyToClipboard";
+import { CloseIcon, ExpandIcon } from "./Icons";
 
 const SnippetList = () => {
-  const { language } = useAppContext();
+  const { language, setSnippet } = useAppContext();
   const { fetchedSnippets } = useSnippets();
+  const [isModalOpen, setIsModalOpen] = useState(false);
 
   if (!fetchedSnippets) return <p>Empty List</p>;
 
+  const handleOpenModal = (activeSnippet: SnippetType) => {
+    setIsModalOpen(true);
+    setSnippet(activeSnippet);
+  };
+
+  const handleCloseModal = () => {
+    setIsModalOpen(false);
+    setSnippet(null);
+  };
+
   return (
     <ul role="list" className="snippets">
-      {fetchedSnippets.map((snippet) => (
-        <li className="snippet">
+      {fetchedSnippets.map((snippet, idx) => (
+        <li key={idx} className="snippet">
           <div className="snippet__preview">
             <img src={language.icon} alt={language.lang} />
-            <Button isIcon={true} className="snippet__copy">
+            {/* <Button isIcon={true} className="snippet__copy">
               <CopyIcon />
-            </Button>
+            </Button> */}
           </div>
 
           <div className="snippet__content">
             <h3 className="snippet__title">{snippet.title}</h3>
-            <Button isIcon={true}>
+            <Button isIcon={true} onClick={() => handleOpenModal(snippet)}>
               <ExpandIcon />
             </Button>
           </div>
+          {isModalOpen && (
+            <SnippetModal>
+              <div className="modal | flow" data-flow-space="lg">
+                <div className="modal__header">
+                  <h2 className="section-title">{snippet.title}</h2>
+                  <Button isIcon={true} onClick={handleCloseModal}>
+                    <CloseIcon />
+                  </Button>
+                </div>
+                <div className="code-preview">
+                  <CopyToClipboard className="modal__copy" />
+                  <CodePreview language={slugify(language.lang)}>
+                    {snippet.code}
+                  </CodePreview>
+                </div>
+                <p>
+                  <b>Description: </b>
+                  {snippet.description}
+                </p>
+                <p>
+                  Contributed by <b>{snippet.author}</b>
+                </p>
+                <ul role="list" className="modal__tags">
+                  {snippet.tags.map((tag) => (
+                    <li key={tag} className="modal__tag">
+                      {tag}
+                    </li>
+                  ))}
+                </ul>
+              </div>
+            </SnippetModal>
+          )}
         </li>
       ))}
     </ul>
diff --git a/src/components/SnippetModal.tsx b/src/components/SnippetModal.tsx
index 54279359..b4286c73 100644
--- a/src/components/SnippetModal.tsx
+++ b/src/components/SnippetModal.tsx
@@ -1,46 +1,16 @@
-import { useEffect, useState } from "react";
+import React from "react";
 import ReactDOM from "react-dom";
-import { LanguageData, SnippetType } from "../types";
-import { getSnippetByTitleAndCategory } from "../utils/filters";
-import { CloseIcon, CopyIcon } from "./Icons";
-import Button from "./Button";
-import CodePreview from "./CodePreview";
 
-const SnippetModal = () => {
+type Props = {
+  children: React.ReactNode;
+};
+
+const SnippetModal: React.FC<Props> = ({ children }) => {
   const modalRoot = document.getElementById("modal-root");
   if (!modalRoot) return null;
 
   return ReactDOM.createPortal(
-    <div className="modal-overlay">
-      <div className="modal | flow" data-flow-space="lg">
-        <div className="modal__header">
-          <h2 className="section-title">{snippet.title}</h2>
-          <Button isIcon={true} onClick={() => navigate(-1)}>
-            <CloseIcon />
-          </Button>
-        </div>
-        <div className="code-preview">
-          <Button isIcon={true} className="modal__copy">
-            <CopyIcon />
-          </Button>
-          <CodePreview language={language}>{snippet.code}</CodePreview>
-        </div>
-        <p>
-          <b>Description: </b>
-          {snippet.description}
-        </p>
-        <p>
-          Contributed by <b>{snippet.author}</b>
-        </p>
-        <ul role="list" className="modal__tags">
-          {snippet.tags.map((tag) => (
-            <li key={tag} className="modal__tag">
-              {tag}
-            </li>
-          ))}
-        </ul>
-      </div>
-    </div>,
+    <div className="modal-overlay">{children}</div>,
     modalRoot
   );
 };
diff --git a/src/contexts/AppContext.tsx b/src/contexts/AppContext.tsx
index e12c9c15..04537071 100644
--- a/src/contexts/AppContext.tsx
+++ b/src/contexts/AppContext.tsx
@@ -14,6 +14,7 @@ const defaultState: AppState = {
   setLanguage: () => {},
   category: defaultCategory,
   setCategory: () => {},
+  snippet: null,
   setSnippet: () => {},
 };
 
@@ -26,7 +27,7 @@ export const AppProvider: React.FC<{ children: React.ReactNode }> = ({
 }) => {
   const [language, setLanguage] = useState<LanguageType>(defaultLanguage);
   const [category, setCategory] = useState<string>(defaultCategory);
-  const [snippet, setSnippet] = useState<SnippetType>();
+  const [snippet, setSnippet] = useState<SnippetType | null>(null);
 
   return (
     <AppContext.Provider
diff --git a/src/types/index.ts b/src/types/index.ts
index a7fc087e..447d4f72 100644
--- a/src/types/index.ts
+++ b/src/types/index.ts
@@ -21,6 +21,6 @@ export type AppState = {
   setLanguage: React.Dispatch<React.SetStateAction<LanguageType>>;
   category: string;
   setCategory: React.Dispatch<React.SetStateAction<string>>;
-  snippet?: SnippetType;
-  setSnippet: React.Dispatch<React.SetStateAction<SnippetType | undefined>>;
+  snippet: SnippetType | null;
+  setSnippet: React.Dispatch<React.SetStateAction<SnippetType | null>>;
 };