diff --git a/panoramix/forms.py b/panoramix/forms.py
index 70a897c127ea2..233ed65a50375 100644
--- a/panoramix/forms.py
+++ b/panoramix/forms.py
@@ -571,11 +571,11 @@ def add_to_form(attrs):
             else:
                 time_fields = 'granularity_sqla'
                 add_to_form((time_fields, ))
-            add_to_form(('since', 'until'))
         else:
             time_fields = 'granularity'
             add_to_form(('granularity',))
             field_css_classes['granularity'] = ['form-control', 'select2']
+        add_to_form(('since', 'until'))
 
         QueryForm.fieldsets = ({
             'label': 'Time',