diff --git a/Spottie.xcodeproj/project.pbxproj b/Spottie.xcodeproj/project.pbxproj
index 4e5ae34..5e5cfb5 100644
--- a/Spottie.xcodeproj/project.pbxproj
+++ b/Spottie.xcodeproj/project.pbxproj
@@ -70,6 +70,7 @@
 		475798D5266F1B9B00AADF2F /* WebAPIPlaylistTracksRefObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = 475798D4266F1B9B00AADF2F /* WebAPIPlaylistTracksRefObject.swift */; };
 		475EE242267C9306007BEBDC /* ShortcutGrid.swift in Sources */ = {isa = PBXBuildFile; fileRef = 475EE241267C9306007BEBDC /* ShortcutGrid.swift */; };
 		475EE244267D6659007BEBDC /* ShortcutItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 475EE243267D6659007BEBDC /* ShortcutItem.swift */; };
+		475EE248267D7784007BEBDC /* SearchField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 475EE247267D7784007BEBDC /* SearchField.swift */; };
 		47C56F602679A789003EA20A /* PlayerCommands.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47C56F5F2679A789003EA20A /* PlayerCommands.swift */; };
 /* End PBXBuildFile section */
 
@@ -139,6 +140,7 @@
 		475798D4266F1B9B00AADF2F /* WebAPIPlaylistTracksRefObject.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WebAPIPlaylistTracksRefObject.swift; sourceTree = "<group>"; };
 		475EE241267C9306007BEBDC /* ShortcutGrid.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShortcutGrid.swift; sourceTree = "<group>"; };
 		475EE243267D6659007BEBDC /* ShortcutItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShortcutItem.swift; sourceTree = "<group>"; };
+		475EE247267D7784007BEBDC /* SearchField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchField.swift; sourceTree = "<group>"; };
 		47C56F5F2679A789003EA20A /* PlayerCommands.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlayerCommands.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -318,6 +320,7 @@
 				474BAFC2266B85440006EB16 /* CarouselRowItem.swift */,
 				475EE241267C9306007BEBDC /* ShortcutGrid.swift */,
 				475EE243267D6659007BEBDC /* ShortcutItem.swift */,
+				475EE247267D7784007BEBDC /* SearchField.swift */,
 			);
 			path = Components;
 			sourceTree = "<group>";
@@ -465,6 +468,7 @@
 				470201CA265CF9380030ECA9 /* ShuffleButton.swift in Sources */,
 				4730619326591EE1001E3A1F /* TrackChangedEvent.swift in Sources */,
 				475798CD266F0F7F00AADF2F /* WebAPIPlaylistObject.swift in Sources */,
+				475EE248267D7784007BEBDC /* SearchField.swift in Sources */,
 				4730619526591EF9001E3A1F /* PlaybackResumedEvent.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
diff --git a/Spottie/Views/Components/SearchField.swift b/Spottie/Views/Components/SearchField.swift
new file mode 100644
index 0000000..935e21c
--- /dev/null
+++ b/Spottie/Views/Components/SearchField.swift
@@ -0,0 +1,44 @@
+//
+//  SearchField.swift
+//  Spottie
+//
+//  Created by Lee Jun Kit on 19/6/21.
+//
+
+import SwiftUI
+
+// https://stackoverflow.com/questions/64376948/swiftui-how-to-use-nssearchtoolbaritem-on-macos-11
+struct SearchField: NSViewRepresentable {
+    class Coordinator: NSObject, NSSearchFieldDelegate {
+        var parent: SearchField
+
+        init(_ parent: SearchField) {
+            self.parent = parent
+        }
+
+        func controlTextDidChange(_ notification: Notification) {
+            guard let searchField = notification.object as? NSSearchField else {
+                print("Unexpected control in update notification")
+                return
+            }
+            self.parent.search = searchField.stringValue
+        }
+
+    }
+
+    @Binding var search: String
+
+    func makeNSView(context: Context) -> NSSearchField {
+        NSSearchField(frame: .zero)
+    }
+
+    func updateNSView(_ searchField: NSSearchField, context: Context) {
+        searchField.stringValue = search
+        searchField.delegate = context.coordinator
+    }
+
+    func makeCoordinator() -> Coordinator {
+        return Coordinator(self)
+    }
+
+}
diff --git a/Spottie/Views/ContentView.swift b/Spottie/Views/ContentView.swift
index 1fa0d41..116c32e 100644
--- a/Spottie/Views/ContentView.swift
+++ b/Spottie/Views/ContentView.swift
@@ -13,6 +13,7 @@ enum Screen: Hashable {
 
 struct ContentView<M: PlayerStateProtocol>: View {
     @State var screen: Screen? = .home
+    @State var searchText = ""
     
     var body: some View {
         VStack {
@@ -24,6 +25,12 @@ struct ContentView<M: PlayerStateProtocol>: View {
                 .frame(height: 66)
                 .padding()
         }
+        .toolbar {
+            ToolbarItem {
+                SearchField(search: $searchText)
+                    .frame(minWidth: 100, idealWidth: 200, maxWidth: .infinity)
+            }
+        }
     }
 }