diff --git a/src/js/index.js b/src/js/index.js
index 59c80c9d2..3c03fd77d 100644
--- a/src/js/index.js
+++ b/src/js/index.js
@@ -1,7 +1,6 @@
 'use strict';
 
 /* global angular:false */
-/* global showdown:false */
 /* global moment:false */
 /* global $:false */
 /* global ERROR,ISTATES,HSTATES,RSTATES */
@@ -177,6 +176,19 @@ app.filter('appProgressMessage', function () {
     };
 });
 
+// see apps.js $scope.states
+app.filter('selectedStateFilter', function () {
+    return function selectedStateFilter(apps, selectedState) {
+        return apps.filter(function (app) {
+            if (!selectedState || !selectedState.state) return true;
+
+            if (selectedState.state === 'running') return app.runState === 'running' && app.health === 'healthy' && app.installationState === 'installed';
+
+            return app.runState !== 'running' || app.health !== 'healthy' || app.installationState !== 'installed';
+        });
+    };
+});
+
 app.filter('selectedTagFilter', function () {
     return function selectedTagFilter(apps, selectedTags) {
         return apps.filter(function (app) {
diff --git a/src/views/apps.html b/src/views/apps.html
index 132c4b009..c4f17525e 100644
--- a/src/views/apps.html
+++ b/src/views/apps.html
@@ -117,7 +117,8 @@
         My Apps
         <div class="pull-right">
           <form class="form-inline">
-            <input type="text" class="form-control" placeholder="Search Apps" id="appSearch" ng-model="appSearch" ng-show="installedApps.length > 10"/>
+            <input type="text" class="form-control" ng-show="installedApps.length > 8" placeholder="Search Apps" id="appSearch" ng-model="appSearch"/>
+            <multiselect ng-model="selectedState" ng-show="installedApps.length > 1" ms-header="All States" ms-selected="{{ selectedState }}" options="state.label for state in states" data-multiple="false"></multiselect>
             <multiselect ng-model="selectedTags" ng-show="tags.length > 0" ms-header="All Tags" ms-selected="Tags: {{ selectedTags.join(', ') }}" options="tag for tag in tags" data-multiple="true" filter-after-rows="5" scroll-after-rows="10"></multiselect>
             <multiselect ng-model="selectedDomain" ng-show="filterDomains.length > 2" data-compare-by="domain" ms-selected="{{ selectedDomain.domain }}" options="domain.domain for domain in filterDomains" data-multiple="false" filter-after-rows="5" scroll-after-rows="10"></multiselect>
           </form>
@@ -127,7 +128,7 @@
 
     <div class="animateMeOpacity ng-hide" ng-show="installedApps.length > 0">
       <div class="app-grid">
-        <div class="grid-item" ng-repeat="app in installedApps | selectedTagFilter:selectedTags | selectedDomainFilter:selectedDomain | appSearchFilter:appSearch | orderBy:'fqdn'">
+        <div class="grid-item" ng-repeat="app in installedApps | selectedStateFilter:selectedState | selectedTagFilter:selectedTags | selectedDomainFilter:selectedDomain | appSearchFilter:appSearch | orderBy:'fqdn'">
           <a ng-href="{{ app | applicationLink }}" ng-click="user.isAtLeastAdmin && (((app | installError) === true || (app | installationActive) === true) && showAppConfigure(app, 'repair')) || ((app | appIsInstalledAndHealthy) && app.pendingPostInstallConfirmation && appPostInstallConfirm.show(app))" target="_blank" ng-class="{ 'hand': (app | appIsInstalledAndHealthy) || (app | installError)  || (app | installationActive)}">
             <div class="highlight grid-item-content" uib-tooltip="{{ app.fqdn }}" tooltip-class="long nowrap">
               <div class="grid-item-top">
diff --git a/src/views/apps.js b/src/views/apps.js
index 240c19941..5ed31fefd 100644
--- a/src/views/apps.js
+++ b/src/views/apps.js
@@ -8,6 +8,12 @@ angular.module('Application').controller('AppsController', ['$scope', '$timeout'
 
     $scope.installedApps = Client.getInstalledApps();
     $scope.tags = Client.getAppTags();
+    $scope.states = [
+        { state: '', label: 'All States' },
+        { state: 'running', label: 'Running' },
+        { state: 'not_running', label: 'Not Running' }
+    ];
+    $scope.selectedState = $scope.states[0];
     $scope.selectedTags = [];
     $scope.selectedDomain = ALL_DOMAINS_DOMAIN;
     $scope.filterDomains = [ ALL_DOMAINS_DOMAIN ];