diff --git a/platform/search/src/controllers/ClickAwayController.js b/platform/search/src/controllers/ClickAwayController.js
index 75b1d985da..9b92e89cc0 100644
--- a/platform/search/src/controllers/ClickAwayController.js
+++ b/platform/search/src/controllers/ClickAwayController.js
@@ -21,6 +21,10 @@
  *****************************************************************************/
 /*global define,Promise*/
 
+/*
+ * Copied from the ClickAwayController in platform/commonUI/general
+ */
+
 define(
     [],
     function () {
diff --git a/platform/search/test/controllers/ClickAwayControllerSpec.js b/platform/search/test/controllers/ClickAwayControllerSpec.js
new file mode 100644
index 0000000000..96e7b6c13f
--- /dev/null
+++ b/platform/search/test/controllers/ClickAwayControllerSpec.js
@@ -0,0 +1,94 @@
+/*****************************************************************************
+ * Open MCT Web, Copyright (c) 2014-2015, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT Web is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT Web includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+/*global define,Promise,describe,it,expect,beforeEach,waitsFor,jasmine*/
+
+define(
+    ["../../src/controllers/ClickAwayController"],
+    function (ClickAwayController) {
+        "use strict";
+
+        describe("The click-away controller", function () {
+            var mockScope,
+                mockDocument,
+                controller;
+
+            beforeEach(function () {
+                mockScope = jasmine.createSpyObj(
+                    "$scope",
+                    [ "$apply" ]
+                );
+                mockDocument = jasmine.createSpyObj(
+                    "$document",
+                    [ "on", "off" ]
+                );
+                controller = new ClickAwayController(mockScope, mockDocument);
+            });
+
+            it("is initially inactive", function () {
+                expect(controller.isActive()).toBe(false);
+            });
+
+            it("does not listen to the document before being toggled", function () {
+                expect(mockDocument.on).not.toHaveBeenCalled();
+            });
+
+            it("tracks enabled/disabled state when toggled", function () {
+                controller.toggle();
+                expect(controller.isActive()).toBe(true);
+                controller.toggle();
+                expect(controller.isActive()).toBe(false);
+                controller.toggle();
+                expect(controller.isActive()).toBe(true);
+                controller.toggle();
+                expect(controller.isActive()).toBe(false);
+            });
+
+            it("allows active state to be explictly specified", function () {
+                controller.setState(true);
+                expect(controller.isActive()).toBe(true);
+                controller.setState(true);
+                expect(controller.isActive()).toBe(true);
+                controller.setState(false);
+                expect(controller.isActive()).toBe(false);
+                controller.setState(false);
+                expect(controller.isActive()).toBe(false);
+            });
+
+            it("registers a mouse listener when activated", function () {
+                controller.setState(true);
+                expect(mockDocument.on).toHaveBeenCalled();
+            });
+
+            it("deactivates and detaches listener on document click", function () {
+                var callback;
+                controller.setState(true);
+                callback = mockDocument.on.mostRecentCall.args[1];
+                callback();
+                expect(controller.isActive()).toEqual(false);
+                expect(mockDocument.off).toHaveBeenCalledWith("mouseup", callback);
+            });
+
+
+
+        });
+    }
+);
\ No newline at end of file
diff --git a/platform/search/test/suite.json b/platform/search/test/suite.json
index d6faf47e5c..f9d5372a89 100644
--- a/platform/search/test/suite.json
+++ b/platform/search/test/suite.json
@@ -1,6 +1,7 @@
 [
     "controllers/SearchController",
     "controllers/SearchItemController",
+    "controllers/ClickAwayController",
     "services/SearchAggregator",
     "services/GenericSearchProvider",
     "services/GenericSearchWorker"