diff --git a/client/src/main/java/ru/trader/controllers/FilterController.java b/client/src/main/java/ru/trader/controllers/FilterController.java
index 62387fe..3422c1b 100644
--- a/client/src/main/java/ru/trader/controllers/FilterController.java
+++ b/client/src/main/java/ru/trader/controllers/FilterController.java
@@ -131,7 +131,11 @@ public class FilterController {
         return showDialog(parent, content, new MarketFilter());
     }
 
-    public Optional<MarketFilter> showDialog(Parent parent, Parent content, MarketFilter filter){
+    public boolean showEditDialog(Parent parent, Parent content, MarketFilter filter){
+        return showDialog(parent, content, filter).isPresent();
+    }
+
+    private Optional<MarketFilter> showDialog(Parent parent, Parent content, MarketFilter filter){
         if (dlg == null){
             createDialog(parent, content);
         }
@@ -164,7 +168,4 @@ public class FilterController {
         excludes.getItems().clear();
     }
 
-    public MarketFilter getFilter(){
-        return filter;
-    }
 }
diff --git a/client/src/main/java/ru/trader/controllers/MainController.java b/client/src/main/java/ru/trader/controllers/MainController.java
index 21bc1f6..766e219 100644
--- a/client/src/main/java/ru/trader/controllers/MainController.java
+++ b/client/src/main/java/ru/trader/controllers/MainController.java
@@ -258,12 +258,9 @@ public class MainController {
     }
 
     public void editFilter(){
-        /*TODO: implement
-        Optional<MarketFilter> res = Screeners.showFilter(market.getAnalyzer().getFilter());
-        if (res.isPresent()){
-            Main.SETTINGS.setFilter(res.get());
+        if (Screeners.showFilter(market.getAnalyzer().getFilter())){
+            Main.SETTINGS.setFilter(market.getAnalyzer().getFilter());
         }
-        */
     }
 
     public void impMadSystems(ActionEvent actionEvent) {
diff --git a/client/src/main/java/ru/trader/controllers/Screeners.java b/client/src/main/java/ru/trader/controllers/Screeners.java
index 03a4c79..ff928e6 100644
--- a/client/src/main/java/ru/trader/controllers/Screeners.java
+++ b/client/src/main/java/ru/trader/controllers/Screeners.java
@@ -224,8 +224,8 @@ public class Screeners {
         return filterController.showDialog(mainScreen, filterScreen);
     }
 
-    public static Optional<MarketFilter> showFilter(MarketFilter filter) {
-        return filterController.showDialog(mainScreen, filterScreen, filter);
+    public static boolean showFilter(MarketFilter filter) {
+        return filterController.showEditDialog(mainScreen, filterScreen, filter);
     }
 
     public static Optional<Pair<String, String>> showLogin() {
diff --git a/core/src/main/java/ru/trader/core/MarketAnalyzer.java b/core/src/main/java/ru/trader/core/MarketAnalyzer.java
index a8714f1..5d324c7 100644
--- a/core/src/main/java/ru/trader/core/MarketAnalyzer.java
+++ b/core/src/main/java/ru/trader/core/MarketAnalyzer.java
@@ -302,6 +302,10 @@ public class MarketAnalyzer {
         return vendors;
     }
 
+    public MarketFilter getFilter(){
+        return market.getFilter();
+    }
+
     public MarketAnalyzer newInstance(Profile profile, AnalysisCallBack callback){
         return new MarketAnalyzer(market, profile, callback);
     }