diff --git a/app/components/volumes/volumes.html b/app/components/volumes/volumes.html
index 80df39615..c3fe10427 100644
--- a/app/components/volumes/volumes.html
+++ b/app/components/volumes/volumes.html
@@ -30,6 +30,17 @@
       <div class="pull-right">
         <input type="text" id="filter" ng-model="state.filter" placeholder="Filter..." class="form-control input-sm" />
       </div>
+      <span class="btn-group btn-group-sm pull-right" style="margin-right: 20px;">
+        <label class="btn btn-primary" ng-model="state.danglingVolumesOnly" uib-btn-radio="undefined">
+          All
+        </label>
+        <label class="btn btn-primary" ng-model="state.danglingVolumesOnly" uib-btn-radio="false">
+          Attached
+        </label>
+        <label class="btn btn-primary" ng-model="state.danglingVolumesOnly" uib-btn-radio="true">
+          Dangling
+        </label>
+      </span>
     </rd-widget-taskbar>
     <rd-widget-body classes="no-padding">
       <div class="table-responsive">
@@ -70,7 +81,7 @@
             </tr>
           </thead>
           <tbody>
-            <tr dir-paginate="volume in (state.filteredVolumes = (volumes | filter:state.filter | orderBy:sortType:sortReverse | itemsPerPage: state.pagination_count))">
+            <tr dir-paginate="volume in (state.filteredVolumes = (volumes | filter:{dangling: state.danglingVolumesOnly} | filter:state.filter | orderBy:sortType:sortReverse | itemsPerPage: state.pagination_count))">
               <td><input type="checkbox" ng-model="volume.Checked" ng-change="selectItem(volume)"/></td>
               <td><a ui-sref="volume({id: volume.Id})">{{ volume.Id|truncate:25 }}</a></td>
               <td>{{ volume.Driver }}</td>
@@ -85,7 +96,7 @@
             <tr ng-if="!volumes">
               <td colspan="5" class="text-center text-muted">Loading...</td>
             </tr>
-            <tr ng-if="volumes.length == 0">
+            <tr ng-if="volumes.length === 0 || state.filteredVolumes.length === 0">
               <td colspan="5" class="text-center text-muted">No volumes available.</td>
             </tr>
           </tbody>
diff --git a/app/components/volumes/volumesController.js b/app/components/volumes/volumesController.js
index 89f3bd0c3..2bc0453e8 100644
--- a/app/components/volumes/volumesController.js
+++ b/app/components/volumes/volumesController.js
@@ -65,13 +65,29 @@ function ($q, $scope, VolumeService, Notifications, Pagination) {
 
   function initView() {
     $('#loadVolumesSpinner').show();
-    VolumeService.volumes()
-    .then(function success(data) {
-      $scope.volumes = data;
+    
+    $q.all({
+      attached: VolumeService.volumes({
+        filters: { 
+          'dangling': ['false']
+        }
+      }),
+      dangling: VolumeService.volumes({
+        filters: { 
+          'dangling': ['true']
+        }
+      })
     })
-    .catch(function error(err) {
+    .then(function success(data) {
+      $scope.volumes = data.attached.map(function(volume) {
+        volume.dangling = false;
+        return volume;
+      }).concat(data.dangling.map(function(volume) {
+        volume.dangling = true;
+        return volume;
+      }));
+    }).catch(function error(err) {
       Notifications.error('Failure', err, 'Unable to retrieve volumes');
-      $scope.volumes = [];
     })
     .finally(function final() {
       $('#loadVolumesSpinner').hide();
diff --git a/app/services/docker/volumeService.js b/app/services/docker/volumeService.js
index b326d8acc..2a67bef4e 100644
--- a/app/services/docker/volumeService.js
+++ b/app/services/docker/volumeService.js
@@ -3,9 +3,9 @@ angular.module('portainer.services')
   'use strict';
   var service = {};
 
-  service.volumes = function() {
+  service.volumes = function(params) {
     var deferred = $q.defer();
-    Volume.query().$promise
+    Volume.query(params).$promise
     .then(function success(data) {
       var volumes = data.Volumes || [];
       volumes = volumes.map(function (item) {