diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/TargetFilterTable.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/TargetFilterTable.java
index 010e37bde..caf6976fd 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/TargetFilterTable.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/TargetFilterTable.java
@@ -226,7 +226,7 @@ public class TargetFilterTable extends Table {
         final TargetFilterQuery targetFilterQuery = targetFilterQueryManagement
                 .findTargetFilterQueryByName(targetFilterName);
         filterManagementUIState.setFilterQueryValue(targetFilterQuery.getQuery());
-
+        filterManagementUIState.setTfQuery(targetFilterQuery);
         filterManagementUIState.setEditViewDisplayed(true);
         eventBus.publish(this, CustomFilterUIEvent.TARGET_FILTER_DETAIL_VIEW);
     }