diff --git a/elasticutils/__init__.py b/elasticutils/__init__.py
index f63474a..154f8d3 100644
--- a/elasticutils/__init__.py
+++ b/elasticutils/__init__.py
@@ -175,10 +175,13 @@ def split_field_action(s):
     'foo', 'bar'
     >>> split_field_action('foo')
     'foo', None
+    >>> split_field_action('creator__first_name__')
+    'creator__first_name', None
 
     """
     if '__' in s:
-        return s.rsplit('__', 1)
+        field, action = s.rsplit('__', 1)
+        return field, (action or None)
     return s, None