diff --git a/app/flatpak-builtins-document-list.c b/app/flatpak-builtins-document-list.c
index 12ccd679..47b6a434 100644
--- a/app/flatpak-builtins-document-list.c
+++ b/app/flatpak-builtins-document-list.c
@@ -212,6 +212,7 @@ flatpak_complete_document_list (FlatpakCompletion *completion)
     case 1: /* APPID */
       flatpak_complete_options (completion, global_entries);
       flatpak_complete_options (completion, options);
+      flatpak_complete_columns (completion, all_columns);
 
       user_dir = flatpak_dir_get_user ();
       {
diff --git a/app/flatpak-builtins-history.c b/app/flatpak-builtins-history.c
index 2b8d740d..160eb0d1 100644
--- a/app/flatpak-builtins-history.c
+++ b/app/flatpak-builtins-history.c
@@ -488,5 +488,6 @@ flatpak_complete_history (FlatpakCompletion *completion)
   flatpak_complete_options (completion, global_entries);
   flatpak_complete_options (completion, user_entries);
   flatpak_complete_options (completion, options);
+  flatpak_complete_columns (completion, all_columns);
   return TRUE;
 }
diff --git a/app/flatpak-builtins-list.c b/app/flatpak-builtins-list.c
index 758f1f98..4c024942 100644
--- a/app/flatpak-builtins-list.c
+++ b/app/flatpak-builtins-list.c
@@ -473,5 +473,6 @@ flatpak_complete_list (FlatpakCompletion *completion)
   flatpak_complete_options (completion, global_entries);
   flatpak_complete_options (completion, options);
   flatpak_complete_options (completion, user_entries);
+  flatpak_complete_columns (completion, all_columns);
   return TRUE;
 }
diff --git a/app/flatpak-builtins-ps.c b/app/flatpak-builtins-ps.c
index 88e15ae8..8fc750b7 100644
--- a/app/flatpak-builtins-ps.c
+++ b/app/flatpak-builtins-ps.c
@@ -184,6 +184,7 @@ flatpak_complete_ps (FlatpakCompletion *completion)
     case 1:
       flatpak_complete_options (completion, global_entries);
       flatpak_complete_options (completion, options);
+      flatpak_complete_columns (completion, all_columns);
       break;
 
     default:
diff --git a/app/flatpak-builtins-remote-list.c b/app/flatpak-builtins-remote-list.c
index 246dc055..78a39abb 100644
--- a/app/flatpak-builtins-remote-list.c
+++ b/app/flatpak-builtins-remote-list.c
@@ -202,6 +202,7 @@ flatpak_complete_remote_list (FlatpakCompletion *completion)
       flatpak_complete_options (completion, global_entries);
       flatpak_complete_options (completion, options);
       flatpak_complete_options (completion, user_entries);
+      flatpak_complete_columns (completion, all_columns);
 
       break;
     }
diff --git a/app/flatpak-builtins-remote-ls.c b/app/flatpak-builtins-remote-ls.c
index baee0e3f..7c4817fa 100644
--- a/app/flatpak-builtins-remote-ls.c
+++ b/app/flatpak-builtins-remote-ls.c
@@ -526,6 +526,7 @@ flatpak_complete_remote_ls (FlatpakCompletion *completion)
       flatpak_complete_options (completion, global_entries);
       flatpak_complete_options (completion, options);
       flatpak_complete_options (completion, user_entries);
+      flatpak_complete_columns (completion, all_columns);
 
       for (i = 0; i < dirs->len; i++)
         {