diff --git a/src/qgcunittest/UnitTestList.cc b/src/qgcunittest/UnitTestList.cc
index 23b28f6ab8154c7f8c5aec6beb079889d5a80bf1..d0c70f8a760ae704cd015dca89260991197a6799 100644
--- a/src/qgcunittest/UnitTestList.cc
+++ b/src/qgcunittest/UnitTestList.cc
@@ -47,7 +47,6 @@ 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)
@@ -58,3 +57,6 @@ UT_REGISTER_TEST(LogDownloadTest)
 // 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)
+
diff --git a/src/ui/MainWindow.cc b/src/ui/MainWindow.cc
index c753209ffc57e2235a1e4dae77ee925ca48d5639..4435feddbe9ed20dd7f5ada60604920ec3f532e7 100644
--- a/src/ui/MainWindow.cc
+++ b/src/ui/MainWindow.cc
@@ -301,12 +301,17 @@ void MainWindow::_buildCommonWidgets(void)
     logPlayer = new QGCMAVLinkLogPlayer(statusBar());
     statusBar()->addPermanentWidget(logPlayer);
 
+    // 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];
 
         // Add to menu
-        QAction* action = new QAction(tr(pDockWidgetName), this);
+        QAction* action = new QAction(pDockWidgetName, this);
         action->setCheckable(true);
         action->setData(i);
         connect(action, &QAction::triggered, this, &MainWindow::_showDockWidgetAction);
@@ -318,6 +323,11 @@ 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)) {