diff --git a/app/components/containers/containers.html b/app/components/containers/containers.html
index c2811581b..d534f84c7 100644
--- a/app/components/containers/containers.html
+++ b/app/components/containers/containers.html
@@ -17,8 +17,9 @@
         </li>
     </ul>
 
-    <div class="pull-right">
-        <input type="checkbox" ng-model="displayAll" id="displayAll" ng-change="toggleGetAll()"/> <label for="displayAll">Display All</label>
+    <div class="pull-right form-inline">
+        <input type="checkbox" ng-model="displayAll" id="displayAll" ng-change="toggleGetAll()"/> <label for="displayAll">Display All</label>&nbsp;
+        <input type="text" class="form-control" style="vertical-align: center" id="filter" placeholder="Filter" ng-model="filter"/> <label class="sr-only" for="filter">Filter</label>
     </div>
 </div>
 <table class="table table-striped">
@@ -33,7 +34,7 @@
         </tr>
     </thead>
     <tbody>
-        <tr ng-repeat="container in containers|orderBy:predicate">
+        <tr ng-repeat="container in containers | filter:filter | orderBy:predicate">
             <td><input type="checkbox" ng-model="container.Checked" /></td>
             <td><a href="#/containers/{{ container.Id }}/">{{ container|containername}}</a></td>
             <td><a href="#/images/{{ container.Image }}/">{{ container.Image }}</a></td>
diff --git a/app/components/images/images.html b/app/components/images/images.html
index bb3ab40c2..00fc2ec09 100644
--- a/app/components/images/images.html
+++ b/app/components/images/images.html
@@ -3,15 +3,21 @@
 
 <h2>Images:</h2>
 
-<ul class="nav nav-pills">
-    <li class="dropdown">
-        <a class="dropdown-toggle" id="drop4" role="button" data-toggle="dropdown" data-target="#">Actions <b class="caret"></b></a>
-        <ul id="menu1" class="dropdown-menu" role="menu" aria-labelledby="drop4">
-            <li><a tabindex="-1" href="" ng-click="removeAction()">Remove</a></li>
-        </ul>
-    </li>
-    <li><a data-toggle="modal" data-target="#pull-modal" href="">Pull</a></li>
-</ul>
+<div>
+    <ul class="nav nav-pills pull-left">
+        <li class="dropdown">
+            <a class="dropdown-toggle" id="drop4" role="button" data-toggle="dropdown" data-target="#">Actions <b class="caret"></b></a>
+            <ul id="menu1" class="dropdown-menu" role="menu" aria-labelledby="drop4">
+                <li><a tabindex="-1" href="" ng-click="removeAction()">Remove</a></li>
+            </ul>
+        </li>
+        <li><a data-toggle="modal" data-target="#pull-modal" href="">Pull</a></li>
+    </ul>
+
+    <div class="pull-right form-inline">
+        <input type="text" class="form-control" id="filter" placeholder="Filter" ng-model="filter"/> <label class="sr-only" for="filter">Filter</label>
+    </div>
+</div>
 <table class="table table-striped">
     <thead>
         <tr>
@@ -23,7 +29,7 @@
         </tr>
     </thead>
     <tbody>
-        <tr ng-repeat="image in images | orderBy:predicate">
+        <tr ng-repeat="image in images | filter:filter | orderBy:predicate">
             <td><input type="checkbox" ng-model="image.Checked" /></td>
             <td><a href="#/images/{{ image.Id }}/?tag={{ image|repotag }}">{{ image.Id|truncate:20}}</a></td>
             <td>{{ image|repotag }}</td>