diff --git a/lib/controller/action.py b/lib/controller/action.py
index 41035cae9..3f31d93a2 100644
--- a/lib/controller/action.py
+++ b/lib/controller/action.py
@@ -90,12 +90,18 @@ def action():
     if conf.getTables:
         conf.dumper.dbTables(conf.dbmsHandler.getTables())
 
-    if conf.getColumns:
-        conf.dumper.dbTableColumns(conf.dbmsHandler.getColumns())
+    if conf.commonTables:
+        conf.dumper.dbTables(tableExists(paths.COMMON_TABLES))
 
     if conf.getSchema:
         conf.dumper.dbTableColumns(conf.dbmsHandler.getSchema())
 
+    if conf.getColumns:
+        conf.dumper.dbTableColumns(conf.dbmsHandler.getColumns())
+
+    if conf.commonColumns:
+        conf.dumper.dbTableColumns(columnExists(paths.COMMON_COLUMNS))
+
     if conf.dumpTable:
         conf.dumper.dbTableValues(conf.dbmsHandler.dumpTable())
 
@@ -111,13 +117,6 @@ def action():
     if conf.sqlShell:
         conf.dbmsHandler.sqlShell()
 
-    # Brute force options
-    if conf.commonTables:
-        conf.dumper.dbTables(tableExists(paths.COMMON_TABLES))
-
-    if conf.commonColumns:
-        conf.dumper.dbTableColumns(columnExists(paths.COMMON_COLUMNS))
-
     # User-defined function options
     if conf.udfInject:
         conf.dbmsHandler.udfInjectCustom()