diff --git a/src/controller/mastodon/filters.py b/src/controller/mastodon/filters.py
index 20576c8d..e47a5163 100644
--- a/src/controller/mastodon/filters.py
+++ b/src/controller/mastodon/filters.py
@@ -91,7 +91,7 @@ class FilterController(object):
             'context': [],
             'filter_action': self.dialog.actions[self.dialog.action_choice.GetSelection()],
             'expires_in': self.get_expires_in_seconds(selection=self.dialog.expiration_choice.GetSelection(), value=self.dialog.expiration_value.GetValue()),
-            'keywords': self.keywords
+            'keywords_attributes': self.keywords
         }
         for context, checkbox in self.dialog.context_checkboxes.items():
             if checkbox.GetValue():
@@ -99,4 +99,9 @@ class FilterController(object):
         return filter_data
 
     def get_response(self):
-        return self.dialog.ShowModal()
\ No newline at end of file
+        response = self.dialog.ShowModal()
+        if response == widgetUtils.OK:
+            filter_data = self.get_filter_data()
+            result = self.session.api.create_filter_v2(**filter_data)
+            return result
+        return None
\ No newline at end of file
diff --git a/src/controller/mastodon/handler.py b/src/controller/mastodon/handler.py
index 937f5c20..8f461584 100644
--- a/src/controller/mastodon/handler.py
+++ b/src/controller/mastodon/handler.py
@@ -14,7 +14,7 @@ from wxUI import commonMessageDialogs
 from wxUI.dialogs.mastodon import updateProfile as update_profile_dialogs
 from wxUI.dialogs.mastodon import showUserProfile, communityTimeline
 from sessions.mastodon.utils import html_filter
-from . import userActions, settings
+from . import userActions, settings, filters
 
 log = logging.getLogger("controller.mastodon.handler")
 
@@ -51,7 +51,7 @@ class Handler(object):
             favs=None,
             # In buffer Menu.
             community_timeline =_("Create c&ommunity timeline"),
-            filter=None,
+            filter=_("Create a &filter"),
             manage_filters=None
         )
         # Name for the "tweet" menu in the menu bar.
@@ -406,3 +406,12 @@ class Handler(object):
         buffer.session.settings.write()
         communities_position =controller.view.search("communities", buffer.session.get_name())
         pub.sendMessage("createBuffer", buffer_type="CommunityBuffer", session_type=buffer.session.type, buffer_title=title, parent_tab=communities_position, start=True, kwargs=dict(parent=controller.view.nb, function="timeline", name=tl_info, sessionObject=buffer.session, account=buffer.session.get_name(), sound="tweet_timeline.ogg", community_url=url, timeline=bufftype))
+
+    def create_filter(self, controller, buffer):
+        filterController = filters.FilterController(buffer.session)
+        try:
+            filter = filterController.get_response()
+        except MastodonError as error:
+            log.exception("Error adding filter.")
+            commonMessageDialogs.error_adding_filter()
+            return self.create_filter(controller=controller, buffer=buffer)
\ No newline at end of file
diff --git a/src/wxUI/commonMessageDialogs.py b/src/wxUI/commonMessageDialogs.py
index 59fe202b..7545ddba 100644
--- a/src/wxUI/commonMessageDialogs.py
+++ b/src/wxUI/commonMessageDialogs.py
@@ -46,4 +46,7 @@ def cant_update_source() -> wx.MessageDialog:
     return dlg.ShowModal()
 
 def invalid_instance():
-    return wx.MessageDialog(None, _("the provided instance is invalid. Please try again."), _("Invalid instance"), wx.ICON_ERROR).ShowModal()
\ No newline at end of file
+    return wx.MessageDialog(None, _("the provided instance is invalid. Please try again."), _("Invalid instance"), wx.ICON_ERROR).ShowModal()
+
+def error_adding_filter():
+    return wx.MessageDialog(None, _("TWBlue was unable to add or update the filter with the specified settings. Please try again."), _("Error"), wx.ICON_ERROR).ShowModal()
\ No newline at end of file