diff --git a/custom.el b/custom.el
index 9d571ca..fdce5cc 100644
--- a/custom.el
+++ b/custom.el
@@ -28,6 +28,7 @@
      try-expand-line
      try-complete-lisp-symbol-partially
      try-complete-lisp-symbol)))
+ '(ibuffer-expert t)
  '(ibuffer-formats
    (quote
     ((mark
@@ -47,6 +48,8 @@
       (name 16 -1)
       " "
       filename))))
+ '(ibuffer-show-empty-filter-groups
+   nil)
  '(inhibit-startup-screen t)
  '(magit-status-sections-hook
    (quote
@@ -71,7 +74,8 @@
  '(org-imenu-depth 5)
  '(package-selected-packages
    (quote
-    (dockerfile-mode
+    (ibuffer-tramp
+     dockerfile-mode
      docker
      docker-compose-mode
      better-shell
diff --git a/settings.org b/settings.org
index 19dd5af..bd34481 100644
--- a/settings.org
+++ b/settings.org
@@ -586,6 +586,9 @@ put executables in elpy-rpc-venv in path
     ((ibuffer-mode . ibuffer-vc-set-filter-groups-by-vc-root)))
   ;; Use human readable Size column instead of original one
   (use-package ibuffer :bind (("C-x C-b" . ibuffer))
+    :bind (:map ibuffer-mode-map
+		(("C-c t" . ibuffer-tramp-set-filter-groups-by-tramp-connection)
+		 ("C-c g" . ibuffer-vc-set-filter-groups-by-vc-root)))
     :config (define-ibuffer-column size-h (:name "Size" :inline t)
 	      (cond ((> (buffer-size)
 			1000000)