diff --git a/deckbox/cardlist_viewer.xml b/deckbox/cardlist_viewer.xml
index 8c0c769..57fd390 100644
--- a/deckbox/cardlist_viewer.xml
+++ b/deckbox/cardlist_viewer.xml
@@ -10,26 +10,7 @@
 			<minimum width="300" height="400" />
 			<dynamic />
 		</sizelimits>
-		<script>
-			function onInit()
-				cards.setDatabaseNode(getDatabaseNode());
-			end
-			function setTitle(sTitle)
-				if (sTitle or "") == "" then
-					return;
-				end
-				title.setValue(string.format(Interface.getString("cardlist_title_formatted"), sTitle));
-			end
-			function setSource(sNodeName)
-				local sourcenode = getDatabaseNode().getChild(sNodeName);
-				if not sourcenode then
-					Debug.console("ERROR: cardlist_viewer.setSource(): " .. sNodeName .. " was not found.");
-					return
-				end
-
-				cards.setDatabaseNode(sourcenode);
-			end
-		</script>
+		<script file="deckbox/scripts/cardlist_viewer.lua" />
 		<sheetdata>
 			<windowtitlebar name="title">
 				<resource>cardlist_title</resource>
@@ -39,13 +20,39 @@
 				<anchored>
 					<top offset="60" />
 					<left offset="40" />
-					<bottom offset="-40"/>
+					<bottom offset="-70"/>
 					<right offset="-40"/>
 				</anchored>
 				<class>cardlist_viewer_item</class>
 				<columns width="105" fillwidth="true" />
+				<script>
+					function onFilter(item)
+						local sFilter = window.filter_name.getValue();
+
+						if sFilter == "" then
+							return true;
+						end
+
+						local sName = CardsManager.getCardName(item.getDatabaseNode());
+						return sName:upper():find(sFilter:upper(), 1, true);
+					end
+				</script>
 			</windowlist>
 
+			<filter name="filter_name">
+				<anchored height="20">
+					<bottom anchor="bottom" offset="-40" />
+					<right anchor="right" offset="-60" />
+					<left anchor="left" offset="60" />
+				</anchored>
+				<script>
+					function onValueChanged()
+						super.onValueChanged();
+						window.cards.applyFilter();
+					end
+				</script>
+			</filter>
+
 			<resize_partysheet />
 			<close_partysheet />
 		</sheetdata>
diff --git a/deckbox/scripts/cardlist_viewer.lua b/deckbox/scripts/cardlist_viewer.lua
new file mode 100644
index 0000000..edfc58a
--- /dev/null
+++ b/deckbox/scripts/cardlist_viewer.lua
@@ -0,0 +1,22 @@
+local sFilter = "";
+
+function onInit()
+	cards.setDatabaseNode(getDatabaseNode());
+end
+
+function setTitle(sTitle)
+	if (sTitle or "") == "" then
+		return;
+	end
+	title.setValue(string.format(Interface.getString("cardlist_title_formatted"), sTitle));
+end
+
+function setSource(sNodeName)
+	local sourcenode = getDatabaseNode().getChild(sNodeName);
+	if not sourcenode then
+		Debug.console("ERROR: cardlist_viewer.setSource(): " .. sNodeName .. " was not found.");
+		return
+	end
+
+	cards.setDatabaseNode(sourcenode);
+end
\ No newline at end of file
diff --git a/extension.xml b/extension.xml
index 1f63c09..c147ffe 100644
--- a/extension.xml
+++ b/extension.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root version="3.3" release="1.0">
-	<announcement text="Decked Out v2.1.2 by Saagael." icon="decked_out" font="emotefont" />
+	<announcement text="Decked Out v2.2.0 by Saagael." icon="decked_out" font="emotefont" />
 	<properties>
 		<name>Feature: Decked Out</name>
-		<version>2.1.2</version>
+		<version>2.2.0</version>
 		<author>Saagael</author>
 		<description>Adds decks of cards</description>
 		<loadorder>1000</loadorder>