diff --git a/kicad/kicad_manager_frame.h b/kicad/kicad_manager_frame.h
index 54c7599581..47cc108c07 100644
--- a/kicad/kicad_manager_frame.h
+++ b/kicad/kicad_manager_frame.h
@@ -50,6 +50,7 @@ enum TreeFileType {
     TREE_LEGACY_PCB,        // board file (.brd) legacy format
     TREE_SEXPR_PCB,         // board file (.kicad_brd) new s expression format
     TREE_GERBER,            // Gerber  file (.pho, .g*)
+    TREE_GERBER_JOB_FILE,   // Gerber  file (.gbrjob)
     TREE_HTML,              // HTML file (.htm, *.html)
     TREE_PDF,               // PDF file (.pdf)
     TREE_TXT,               // ascii text file (.txt)
diff --git a/kicad/tree_project_frame.cpp b/kicad/tree_project_frame.cpp
index 727288a2f1..7884787d0a 100644
--- a/kicad/tree_project_frame.cpp
+++ b/kicad/tree_project_frame.cpp
@@ -272,6 +272,7 @@ wxString TREE_PROJECT_FRAME::GetFileExt( TreeFileType type )
     case TREE_LEGACY_PCB:            return LegacyPcbFileExtension;
     case TREE_SEXPR_PCB:             return KiCadPcbFileExtension;
     case TREE_GERBER:                return GerberFileExtensionWildCard;
+    case TREE_GERBER_JOB_FILE:       return GerberJobFileExtension;
     case TREE_HTML:                  return HtmlFileExtension;
     case TREE_PDF:                   return PdfFileExtension;
     case TREE_TXT:                   return TextFileExtension;
@@ -406,6 +407,9 @@ wxTreeItemId TREE_PROJECT_FRAME::AddItemToTreeProject(
             if( ext == wxT( "" ) )
                 continue;
 
+            if( i == TREE_GERBER )  // For gerber files, the official ext is gbr
+                ext = "gbr";
+
             reg.Compile( wxString::FromAscii( "^.*\\." ) + ext +
                          wxString::FromAscii( "$" ), wxRE_ICASE );
 
diff --git a/kicad/treeproject_item.cpp b/kicad/treeproject_item.cpp
index a22bafb934..a032a997d6 100644
--- a/kicad/treeproject_item.cpp
+++ b/kicad/treeproject_item.cpp
@@ -191,6 +191,7 @@ void TREEPROJECT_ITEM::Activate( TREE_PROJECT_FRAME* aTreePrjFrame )
         break;
 
     case TREE_GERBER:
+    case TREE_GERBER_JOB_FILE:
     case TREE_DRILL:
     case TREE_DRILL_NC:
     case TREE_DRILL_XNC:
diff --git a/kicad/treeprojectfiles.cpp b/kicad/treeprojectfiles.cpp
index caaa340c7d..d7b481b52e 100644
--- a/kicad/treeprojectfiles.cpp
+++ b/kicad/treeprojectfiles.cpp
@@ -62,6 +62,7 @@ TREEPROJECTFILES::TREEPROJECTFILES( TREE_PROJECT_FRAME* parent )
     m_ImageList->Add( KiBitmap( pcbnew_xpm ) );                 // TREE_LEGACY_PCB
     m_ImageList->Add( KiBitmap( pcbnew_xpm ) );                 // TREE_SEXPR_PCB
     m_ImageList->Add( KiBitmap( icon_gerbview_small_xpm ) );    // TREE_GERBER
+    m_ImageList->Add( KiBitmap( gerber_job_file_xpm ) );        // TREE_GERBER_JOB_FILE (.gbrjob)
     m_ImageList->Add( KiBitmap( html_xpm ) );                   // TREE_HTML
     m_ImageList->Add( KiBitmap( datasheet_xpm ) );              // TREE_PDF
     m_ImageList->Add( KiBitmap( editor_xpm ) );                 // TREE_TXT