diff --git a/platform/commonUI/edit/bundle.json b/platform/commonUI/edit/bundle.json
index 8eb5703c02..5ece248ae8 100644
--- a/platform/commonUI/edit/bundle.json
+++ b/platform/commonUI/edit/bundle.json
@@ -21,6 +21,11 @@
                 "key": "EditPanesController",
                 "implementation": "controllers/EditPanesController.js",
                 "depends": [ "$scope" ]
+            },
+            {
+                "key": "ElementsController",
+                "implementation": "controllers/ElementsController.js",
+                "depends": [ "$scope" ]
             }
         ],
         "directives": [
diff --git a/platform/commonUI/edit/res/templates/elements.html b/platform/commonUI/edit/res/templates/elements.html
index fff8ebd614..365ca246a6 100644
--- a/platform/commonUI/edit/res/templates/elements.html
+++ b/platform/commonUI/edit/res/templates/elements.html
@@ -19,14 +19,21 @@
  this source code distribution or the Licensing information page available
  at runtime from the About dialog for additional information.
 -->
-<div class="current-elements abs" style="height: 100%;">
-    <!--p class="hint">Drop objects here to add them...</p-->
-    <ul class="tree">
-        <li ng-repeat="containedObject in composition">
-            <span class="tree-item">
-                <mct-representation key="'label'" mct-object="containedObject">
-                </mct-representation>
-            </span>
-        </li>
-    </ul>
+<div ng-controller="ElementsController">
+    <mct-include key="'input-filter'"
+                 class="flex-elem holder"
+                 ng-model="filterBy">
+    </mct-include>
+    <div>{{searchText}}</div>
+    <div class="current-elements abs" style="height: 100%;">
+        <!--p class="hint">Drop objects here to add them...</p-->
+        <ul class="tree">
+            <li ng-repeat="containedObject in composition | filter:searchText">
+                <span class="tree-item">
+                    <mct-representation key="'label'" mct-object="containedObject">
+                    </mct-representation>
+                </span>
+            </li>
+        </ul>
+    </div>
 </div>
\ No newline at end of file
diff --git a/platform/commonUI/edit/src/controllers/ElementsController.js b/platform/commonUI/edit/src/controllers/ElementsController.js
new file mode 100644
index 0000000000..fb57387d79
--- /dev/null
+++ b/platform/commonUI/edit/src/controllers/ElementsController.js
@@ -0,0 +1,46 @@
+/*****************************************************************************
+ * 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*/
+
+define(
+    [],
+    function () {
+        "use strict";
+
+        /**
+         * The ElementsController prepares the elements view for display
+         *
+         * @constructor
+         */
+        function ElementsController($scope) {
+            function filterBy(text){
+                if (typeof text === 'undefined')
+                    return $scope.searchText;
+                else
+                    $scope.searchText = text;
+            }
+            $scope.filterBy = filterBy;
+        }
+
+        return ElementsController;
+    }
+);
\ No newline at end of file
diff --git a/platform/commonUI/general/res/templates/object-inspector.html b/platform/commonUI/general/res/templates/object-inspector.html
index 7870c552c7..c056bcaeb4 100644
--- a/platform/commonUI/general/res/templates/object-inspector.html
+++ b/platform/commonUI/general/res/templates/object-inspector.html
@@ -69,9 +69,6 @@
             <div class="split-pane-component pane bottom" ng-show="editMode">
                 <div class="abs holder holder-elements l-flex-col">
                     <em class="flex-elem">Elements</em>
-                    <mct-include key="'input-filter'"
-                                class="flex-elem holder">
-                    </mct-include>
                     <mct-representation
                             key="'edit-elements'"
                             mct-object="domainObject"