diff --git a/domain_source/domain_source.info b/domain_source/domain_source.info
index 89a5d02..752ac76 100644
--- a/domain_source/domain_source.info
+++ b/domain_source/domain_source.info
@@ -7,4 +7,4 @@ files[] = domain_source.domain.inc
 files[] = domain_source.install
 files[] = domain_source.module
 files[] = domain_source.views.inc
-
+files[] = includes/domain_source_handler_filter_domain_id.inc
diff --git a/domain_source/domain_source.views.inc b/domain_source/domain_source.views.inc
index d5e9b42..4b158ef 100644
--- a/domain_source/domain_source.views.inc
+++ b/domain_source/domain_source.views.inc
@@ -50,7 +50,7 @@ function domain_source_views_data() {
     ),
     // Information for accepting a domain_id as a filter
     'filter' => array(
-      'handler' => 'domain_views_handler_filter_domain_domain_id',
+      'handler' => 'domain_source_handler_filter_domain_id',
     ),
     // Information for accepting a domain_id as an argument
     'argument' => array(
@@ -64,3 +64,15 @@ function domain_source_views_data() {
 
   return $data;
 }
+
+/**
+ * Implements hook_views_query_substitutions().
+ *
+ * @see class domain_source_handler_filter_domain_id.
+ * @see http://drupal.org/node/1685658
+ */
+function domain_source_views_query_substitutions($view) {
+  return array(
+    '***CURRENT_DOMAIN_SOURCE***' => DOMAIN_SOURCE_USE_ACTIVE,
+  );
+}
diff --git a/domain_source/includes/domain_source_handler_filter_domain_id.inc b/domain_source/includes/domain_source_handler_filter_domain_id.inc
new file mode 100644
index 0000000..931e595
--- /dev/null
+++ b/domain_source/includes/domain_source_handler_filter_domain_id.inc
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * @file
+ * Interface between domain_source.module and views.module.
+ *
+ * @ingroup domain_source
+ */
+
+/**
+ * Filter for domain ids stored in the database, currently active domain and any domain.
+ */
+class domain_source_handler_filter_domain_id extends domain_views_handler_filter_domain_domain_id {
+
+  /**
+   * Makes sure that views which filter by "Domain Source ID" == "Current Domain"
+   * also include nodes which have their source domain set to
+   * DOMAIN_SOURCE_USE_ACTIVE.
+   *
+   * @see http://drupal.org/node/1685658
+   */
+  function query() {
+    if (in_array('***CURRENT_DOMAIN***', $this->value)) {
+      $this->value[] = '***CURRENT_DOMAIN_SOURCE***';
+    }
+    return parent::query();
+  }
+}