diff --git a/apps/nowait-user/src/assets/icon/cancel.svg b/apps/nowait-user/src/assets/icon/cancel.svg
index b3dfb7df..2767b326 100644
--- a/apps/nowait-user/src/assets/icon/cancel.svg
+++ b/apps/nowait-user/src/assets/icon/cancel.svg
@@ -1,4 +1,4 @@
 <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect x="18.3633" y="19.7773" width="20" height="2" rx="1" transform="rotate(-135 18.3633 19.7773)" fill="#16191E"/>
-<rect x="4.22266" y="18.3633" width="20" height="2" rx="1" transform="rotate(-45 4.22266 18.3633)" fill="#16191E"/>
+<rect x="18.3633" y="19.7773" width="20" height="2" rx="1" transform="rotate(-135 18.3633 19.7773)" fill="currentColor"/>
+<rect x="4.22266" y="18.3633" width="20" height="2" rx="1" transform="rotate(-45 4.22266 18.3633)" fill="currentColor"/>
 </svg>
diff --git a/apps/nowait-user/src/assets/icon/search.svg b/apps/nowait-user/src/assets/icon/search.svg
index adcd7125..0cae67f4 100644
--- a/apps/nowait-user/src/assets/icon/search.svg
+++ b/apps/nowait-user/src/assets/icon/search.svg
@@ -1,3 +1,3 @@
-<svg width="18" height="17" viewBox="0 0 18 17" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M12.1322 12.8127C10.9262 13.7646 9.40312 14.3327 7.7474 14.3327C3.83538 14.3327 0.664062 11.1614 0.664062 7.24935C0.664062 3.33733 3.83538 0.166016 7.7474 0.166016C11.6594 0.166016 14.8307 3.33733 14.8307 7.24935C14.8307 8.90507 14.2626 10.4281 13.3108 11.6342L17.0867 15.4101C17.4121 15.7355 17.4121 16.2632 17.0867 16.5886C16.7612 16.914 16.2336 16.914 15.9081 16.5886L12.1322 12.8127ZM13.1641 7.24935C13.1641 10.2409 10.7389 12.666 7.7474 12.666C4.75585 12.666 2.33073 10.2409 2.33073 7.24935C2.33073 4.25781 4.75585 1.83268 7.7474 1.83268C10.7389 1.83268 13.1641 4.25781 13.1641 7.24935Z" fill="#888888"/>
+<svg width="18" height="17" viewBox="0 0 18 17" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12.1322 12.8127C10.9262 13.7646 9.40312 14.3327 7.7474 14.3327C3.83538 14.3327 0.664062 11.1614 0.664062 7.24935C0.664062 3.33733 3.83538 0.166016 7.7474 0.166016C11.6594 0.166016 14.8307 3.33733 14.8307 7.24935C14.8307 8.90507 14.2626 10.4281 13.3108 11.6342L17.0867 15.4101C17.4121 15.7355 17.4121 16.2632 17.0867 16.5886C16.7612 16.914 16.2336 16.914 15.9081 16.5886L12.1322 12.8127ZM13.1641 7.24935C13.1641 10.2409 10.7389 12.666 7.7474 12.666C4.75585 12.666 2.33073 10.2409 2.33073 7.24935C2.33073 4.25781 4.75585 1.83268 7.7474 1.83268C10.7389 1.83268 13.1641 4.25781 13.1641 7.24935Z" fill="currentColor"/>
 </svg>
diff --git a/apps/nowait-user/src/components/Header.tsx b/apps/nowait-user/src/components/Header.tsx
index 1e9016d2..f05eb8b2 100644
--- a/apps/nowait-user/src/components/Header.tsx
+++ b/apps/nowait-user/src/components/Header.tsx
@@ -3,12 +3,14 @@ import { AnimatePresence, motion } from "framer-motion";
 import { useNavigate } from "react-router-dom";
 import Logo from "../assets/logo.svg?react";
 import Menu from "../assets/icon/menu.svg?react";
-import Search from "../assets/icon/search_black.svg?react";
+import Search from "../assets/icon/search.svg?react";
 import Cancel from "../assets/icon/cancel.svg?react";
 import Portal from "./common/modal/Portal";
+import SearchModal from "./common/modal/SearchModal";
 
 const HomeHeader = () => {
   const [isMenuOpen, setIsMenuOpen] = useState(false);
+  const [isSearchOpen, setIsSearchOpen] = useState(false);
   const navigate = useNavigate();
 
   const toggleMenu = () => {
@@ -19,6 +21,14 @@ const HomeHeader = () => {
     setIsMenuOpen(false);
   };
 
+  const openSearch = () => {
+    setIsSearchOpen(true);
+  };
+
+  const closeSearch = () => {
+    setIsSearchOpen(false);
+  };
+
   const handleBookmarkClick = () => {
     closeMenu();
     navigate("/bookmark");
@@ -34,7 +44,7 @@ const HomeHeader = () => {
       <div className="flex justify-between items-center py-4">
         <Logo className="w-14.5 h-6" />
         <div className="flex flex-row gap-3">
-          <button onClick={() => {}} className="cursor-pointer">
+          <button onClick={openSearch} className="cursor-pointer">
             <Search className="icon-m" />
           </button>
           <button onClick={toggleMenu} className="cursor-pointer">
@@ -113,6 +123,9 @@ const HomeHeader = () => {
           )}
         </AnimatePresence>
       </Portal>
+
+      {/* 전체 화면 검색 모달 */}
+      <SearchModal isOpen={isSearchOpen} onClose={closeSearch} />
     </>
   );
 };
diff --git a/apps/nowait-user/src/components/common/modal/SearchModal.tsx b/apps/nowait-user/src/components/common/modal/SearchModal.tsx
new file mode 100644
index 00000000..e643069c
--- /dev/null
+++ b/apps/nowait-user/src/components/common/modal/SearchModal.tsx
@@ -0,0 +1,279 @@
+import { useState, useEffect } from "react";
+import { motion, AnimatePresence } from "framer-motion";
+import { useNavigate } from "react-router-dom";
+import Portal from "./Portal";
+import Search from "../../../assets/icon/search.svg?react";
+import Cancel from "../../../assets/icon/cancel.svg?react";
+import UserApi from "../../../utils/UserApi";
+import type { SearchStore, SearchResponse } from "../../../types/search";
+
+interface SearchModalProps {
+  isOpen: boolean;
+  onClose: () => void;
+}
+
+const SearchModal = ({ isOpen, onClose }: SearchModalProps) => {
+  const [searchQuery, setSearchQuery] = useState("");
+  const [searchResults, setSearchResults] = useState<SearchStore[]>([]);
+  const [isSearching, setIsSearching] = useState(false);
+  const [recentSearches, setRecentSearches] = useState<string[]>([]);
+  const navigate = useNavigate();
+
+  // 최근 검색어 로드
+  useEffect(() => {
+    const savedSearches = localStorage.getItem("recentSearches");
+    if (savedSearches) {
+      try {
+        setRecentSearches(JSON.parse(savedSearches));
+      } catch (error) {
+        console.error("최근 검색어 로드 실패:", error);
+        setRecentSearches([]);
+      }
+    }
+  }, []);
+
+  // 최근 검색어 저장
+  const saveRecentSearch = (searchTerm: string) => {
+    const newSearches = [
+      searchTerm,
+      ...recentSearches.filter((item) => item !== searchTerm),
+    ].slice(0, 10);
+    setRecentSearches(newSearches);
+    localStorage.setItem("recentSearches", JSON.stringify(newSearches));
+  };
+
+  // 최근 검색어 삭제
+  const removeRecentSearch = (searchTerm: string) => {
+    const newSearches = recentSearches.filter((item) => item !== searchTerm);
+    setRecentSearches(newSearches);
+    localStorage.setItem("recentSearches", JSON.stringify(newSearches));
+  };
+
+  // 검색 API 호출 함수
+  const performSearch = async (query: string) => {
+    if (!query.trim()) {
+      setSearchResults([]);
+      return;
+    }
+
+    setIsSearching(true);
+    try {
+      const response = await UserApi.get<SearchResponse>(
+        `/v1/stores/search?keyword=${encodeURIComponent(query)}`
+      );
+      if (response.data.success) {
+        setSearchResults(response.data.response);
+      } else {
+        setSearchResults([]);
+      }
+    } catch (error) {
+      console.error("검색 실패:", error);
+      setSearchResults([]);
+    } finally {
+      setIsSearching(false);
+    }
+  };
+
+  // 디바운스 검색
+  useEffect(() => {
+    const timer = setTimeout(() => {
+      performSearch(searchQuery);
+    }, 300);
+
+    return () => clearTimeout(timer);
+  }, [searchQuery]);
+
+  // 모달이 닫힐 때 검색 상태 초기화
+  useEffect(() => {
+    if (!isOpen) {
+      setSearchQuery("");
+      setSearchResults([]);
+    }
+  }, [isOpen]);
+
+  // 검색 입력 핸들러
+  const handleSearchInput = (e: React.ChangeEvent<HTMLInputElement>) => {
+    setSearchQuery(e.target.value);
+  };
+
+  // 주점 클릭 핸들러 - 학과명을 최근 검색어에 저장하고 학과 페이지로 이동
+  const handleStoreClick = (store: SearchStore) => {
+    // 학과명을 최근 검색어에 저장
+    saveRecentSearch(store.departmentName);
+
+    // 학과별 주점 목록 페이지로 이동 (departmentId를 query parameter로 전달)
+    navigate(`/store/${store.departmentId}`);
+    onClose();
+  };
+
+  // 최근 검색어 클릭 핸들러
+  const handleRecentSearchClick = (searchTerm: string) => {
+    setSearchQuery(searchTerm);
+  };
+
+  // 검색 결과 아이템 컴포넌트
+  const SearchResultItem = ({ store }: { store: SearchStore }) => (
+    <div
+      className="flex flex-row py-3 gap-3 w-full min-w-0 items-center cursor-pointer"
+      onClick={() => handleStoreClick(store)}
+    >
+      <div className="rounded-full w-11 h-11 bg-gray-200 flex-shrink-0 overflow-hidden">
+        {store.profileImage ? (
+          <img
+            alt={`${store.name} 주점 이미지`}
+            src={store.profileImage}
+            className="w-full h-full object-cover"
+          />
+        ) : (
+          <div className="w-full h-full bg-gray-200" />
+        )}
+      </div>
+      <div className="flex flex-col flex-1 min-w-0">
+        <div className="flex flex-row gap-2 items-center min-w-0">
+          <div className="text-title-16-bold text-black-90 text-start truncate flex-shrink min-w-0">
+            {store.name}
+          </div>
+          <div className="flex-shrink-0">
+            {store.isActive ? (
+              <div className="px-1.5 py-1.25 rounded-md bg-[#FFEEDF]">
+                <div className="font-bold text-[10px] text-[#FF5E07]">
+                  영업중
+                </div>
+              </div>
+            ) : (
+              <div className="px-1.5 py-1.25 rounded-md bg-[#F7F7F7]">
+                <div className="font-bold text-[10px] text-[#AAAAAA]">
+                  오픈 전
+                </div>
+              </div>
+            )}
+          </div>
+        </div>
+        <div className="flex text-13-regular text-black-70 text-start">
+          {store.departmentName}
+        </div>
+      </div>
+    </div>
+  );
+
+  return (
+    <Portal>
+      <AnimatePresence>
+        {isOpen && (
+          <motion.div
+            initial={{ opacity: 0 }}
+            animate={{ opacity: 1 }}
+            exit={{ opacity: 0 }}
+            className="fixed inset-0 z-50 bg-white px-5"
+          >
+            <div className="max-w-[430px] min-w-[360px] w-full h-full bg-white mx-auto">
+              {/* 검색 헤더 */}
+              <motion.div
+                initial={{ y: -20, opacity: 0 }}
+                animate={{ y: 0, opacity: 1 }}
+                exit={{ y: -20, opacity: 0 }}
+                transition={{ duration: 0.3 }}
+                className="flex items-center gap-4 pt-4 mb-10"
+              >
+                <div className="flex-1 relative">
+                  <Search className="absolute left-4 top-1/2 transform -translate-y-1/2 icon-s text-black-60" />
+                  <input
+                    type="text"
+                    placeholder="주점명, 메뉴, 학과 검색"
+                    value={searchQuery}
+                    onChange={handleSearchInput}
+                    className="w-full h-12 pl-12 pr-4 bg-black-15 rounded-2xl text-16-regular text-black-60 placeholder:text-16-regular placeholder:text-black-50 focus:outline-none focus:border-primary"
+                    autoFocus
+                  />
+                </div>
+                <button
+                  onClick={onClose}
+                  className="text-16-medium text-black-70"
+                >
+                  닫기
+                </button>
+              </motion.div>
+
+              {/* 검색 내용 영역 */}
+              <motion.div
+                initial={{ y: 20, opacity: 0 }}
+                animate={{ y: 0, opacity: 1 }}
+                exit={{ y: 20, opacity: 0 }}
+                transition={{ duration: 0.3, delay: 0.1 }}
+                className="flex-1 overflow-y-auto"
+              >
+                {searchQuery.trim() ? (
+                  // 검색 결과 표시
+                  <div className="flex flex-col">
+                    <div className="flex text-16-bold leading-[144%] tracking-[-0.01em] text-black-90 mb-4">
+                      검색 결과{" "}
+                      {searchResults.length > 0 && `${searchResults.length}`}
+                    </div>
+                    {isSearching ? (
+                      <div className="flex justify-center items-center py-8">
+                        <div className="text-16-regular text-black-50">
+                          검색 중...
+                        </div>
+                      </div>
+                    ) : searchResults.length > 0 ? (
+                      <div className="flex flex-col">
+                        {searchResults.map((store) => (
+                          <SearchResultItem key={store.storeId} store={store} />
+                        ))}
+                      </div>
+                    ) : (
+                      <div className="flex flex-col items-center justify-center py-8">
+                        <div className="text-16-regular text-black-50 mb-2">
+                          검색 결과가 없습니다
+                        </div>
+                        <div className="text-14-regular text-black-40">
+                          다른 키워드로 검색해보세요
+                        </div>
+                      </div>
+                    )}
+                  </div>
+                ) : (
+                  // 최근 검색 표시
+                  <div className="flex flex-col gap-4">
+                    <div className="flex text-16-bold leading-[144%] tracking-[-0.01em] text-black-90">
+                      최근 검색
+                    </div>
+                    {recentSearches.length > 0 ? (
+                      recentSearches.map((searchTerm, index) => (
+                        <div
+                          key={index}
+                          className="flex flex-row justify-between"
+                        >
+                          <button
+                            className="flex text-16-regular text-black-90 cursor-pointer"
+                            onClick={() => handleRecentSearchClick(searchTerm)}
+                          >
+                            {searchTerm}
+                          </button>
+                          <div className="flex">
+                            <button
+                              className="flex"
+                              onClick={() => removeRecentSearch(searchTerm)}
+                            >
+                              <Cancel className="icon-xs text-black-60" />
+                            </button>
+                          </div>
+                        </div>
+                      ))
+                    ) : (
+                      <div className="flex text-14-regular text-black-50 py-4">
+                        최근 검색어가 없습니다
+                      </div>
+                    )}
+                  </div>
+                )}
+              </motion.div>
+            </div>
+          </motion.div>
+        )}
+      </AnimatePresence>
+    </Portal>
+  );
+};
+
+export default SearchModal;
diff --git a/apps/nowait-user/src/hooks/useInfiniteStores.ts b/apps/nowait-user/src/hooks/useInfiniteStores.ts
index 5a095ed1..4eb7ef2d 100644
--- a/apps/nowait-user/src/hooks/useInfiniteStores.ts
+++ b/apps/nowait-user/src/hooks/useInfiniteStores.ts
@@ -33,7 +33,7 @@ const fetchStores = async ({
   try {
     // UserApi 사용으로 헤더 설정 자동화 (인터셉터에서 최신 토큰 처리)
     const response = await UserApi.get<ServerResponse>(
-      "/v1/stores/all-stores/infinite-scroll",
+      "/v1/stores/all-stores",
       {
         params: {
           page: pageParam,
diff --git a/apps/nowait-user/src/types/search.ts b/apps/nowait-user/src/types/search.ts
new file mode 100644
index 00000000..a05151a8
--- /dev/null
+++ b/apps/nowait-user/src/types/search.ts
@@ -0,0 +1,18 @@
+export interface SearchStore {
+  storeId: number;
+  departmentId: number;
+  departmentName: string;
+  name: string;
+  location: string;
+  description: string;
+  profileImage: string | null;
+  bannerImages: any[];
+  isActive: boolean;
+  deleted: boolean;
+  createdAt: string;
+}
+
+export interface SearchResponse {
+  success: boolean;
+  response: SearchStore[];
+}
diff --git a/apps/nowait-user/src/utils/UserApi.tsx b/apps/nowait-user/src/utils/UserApi.tsx
index 9e955f3e..cbef028a 100644
--- a/apps/nowait-user/src/utils/UserApi.tsx
+++ b/apps/nowait-user/src/utils/UserApi.tsx
@@ -63,6 +63,7 @@ const refreshToken = async (): Promise<string | null> => {
     }
 
     localStorage.removeItem("accessToken");
+    localStorage.removeItem("recentSearches");
     return null;
   }
 };
@@ -89,14 +90,36 @@ UserApi.interceptors.response.use(
   async (error) => {
     const originalRequest = error.config;
 
-    // 토큰 만료 에러 체크 (401 상태 코드 또는 "access token expired" 메시지)
-    if (
-      error.response?.status === 401 ||
-      (error.response?.data &&
-        (error.response.data.includes?.("access token expired") ||
-          error.response.data.message?.includes?.("access token expired") ||
-          error.response.data === "access token expired"))
-    ) {
+    // 토큰 갱신 조건: access token 만료이지만 refresh token은 정상일 때만
+    const isAccessTokenExpired =
+      error.response?.data &&
+      (error.response.data.includes?.("expired access token") ||
+        error.response.data.message?.includes?.("expired access token") ||
+        error.response.data === "expired access token");
+
+    // refresh token 문제가 있는 경우 토큰 갱신하지 않음
+    const isRefreshTokenInvalid =
+      error.response?.data &&
+      (error.response.data.includes?.("expired refresh token") ||
+        error.response.data.message?.includes?.("expired refresh token") ||
+        error.response.data.includes?.("invalid refresh token") ||
+        error.response.data.message?.includes?.("invalid refresh token") ||
+        error.response.data.includes?.("Invalid or expired refresh token") ||
+        error.response.data.message?.includes?.(
+          "Invalid or expired refresh token"
+        ));
+
+    // refresh token에 문제가 있으면 바로 로그인 페이지로 이동
+    if (isRefreshTokenInvalid) {
+      console.log("Refresh token 문제 감지 - 재로그인 필요");
+      localStorage.removeItem("accessToken");
+      localStorage.removeItem("recentSearches");
+      window.location.href = "/login";
+      return Promise.reject(error);
+    }
+
+    // access token만 만료된 경우에만 토큰 갱신 시도
+    if (isAccessTokenExpired) {
       // 이미 재시도한 요청이면 더 이상 재시도하지 않음
       if (originalRequest._retry) {
         console.log("토큰 갱신 재시도 실패, 로그인 페이지로 이동");
@@ -123,6 +146,7 @@ UserApi.interceptors.response.use(
       } catch (refreshError) {
         console.log("토큰 갱신 중 오류 발생:", refreshError);
         localStorage.removeItem("accessToken");
+        localStorage.removeItem("recentSearches");
         window.location.href = "/login";
         return Promise.reject(error);
       }