diff --git a/src/qgcunittest/UnitTestList.cc b/src/qgcunittest/UnitTestList.cc
index fc78c173c0bad59f9ac7ceb2741b358c0d424e6e..8e395b980ba756dd115c6f76b89fbe3fe2c382bd 100644
--- a/src/qgcunittest/UnitTestList.cc
+++ b/src/qgcunittest/UnitTestList.cc
@@ -52,6 +52,7 @@ UT_REGISTER_TEST(MissionControllerTest)
 UT_REGISTER_TEST(MissionManagerTest)
 UT_REGISTER_TEST(RadioConfigTest)
 UT_REGISTER_TEST(TCPLinkTest)
+UT_REGISTER_TEST(FileManagerTest)
 UT_REGISTER_TEST(ParameterManagerTest)
 UT_REGISTER_TEST(MissionCommandTreeTest)
 UT_REGISTER_TEST(LogDownloadTest)
@@ -69,8 +70,5 @@ UT_REGISTER_TEST(QGCMapPolygonTest)
 // FIXME: Temporarily disabled until this can be stabilized
 //UT_REGISTER_TEST(MainWindowTest)
 
-// Onboard file support has been removed until it can be make to work correctly
-//UT_REGISTER_TEST(FileManagerTest)
-
 // Needs to be update for latest updates
 //UT_REGISTER_TEST(MavlinkLogTest)
diff --git a/src/ui/MainWindow.cc b/src/ui/MainWindow.cc
index 19c006ea3faed58641d5d03481f029bdd01f5eb5..0690ad207a702404add60c3e12cc6a7f7b100796 100644
--- a/src/ui/MainWindow.cc
+++ b/src/ui/MainWindow.cc
@@ -313,10 +313,6 @@ void MainWindow::_buildCommonWidgets(void)
 
     // Populate widget menu
     for (int i = 0, end = ARRAY_SIZE(rgDockWidgetNames); i < end; i++) {
-        if (i == ONBOARD_FILES) {
-            // Temporarily removed until twe can fix all the problems with it
-            continue;
-        }
 
         const char* pDockWidgetName = rgDockWidgetNames[i];
 
@@ -333,11 +329,6 @@ void MainWindow::_buildCommonWidgets(void)
 /// Shows or hides the specified dock widget, creating if necessary
 void MainWindow::_showDockWidget(const QString& name, bool show)
 {
-    if (name == rgDockWidgetNames[ONBOARD_FILES]) {
-        // Temporarily disabled due to bugs
-        return;
-    }
-
     // Create the inner widget if we need to
     if (!_mapName2DockWidget.contains(name)) {
         if(!_createInnerDockWidget(name)) {