diff --git a/interface/resources/qml/dialogs/FileDialog.qml b/interface/resources/qml/dialogs/FileDialog.qml
index d74913b301..42fe7120ea 100644
--- a/interface/resources/qml/dialogs/FileDialog.qml
+++ b/interface/resources/qml/dialogs/FileDialog.qml
@@ -1,5 +1,5 @@
 //
-//  Desktop.qml
+//  FileDialog.qml
 //
 //  Created by Bradley Austin Davis on 14 Jan 2016
 //  Copyright 2015 High Fidelity, Inc.
@@ -195,7 +195,7 @@ ModalWindow {
                 left: parent.left
                 right: parent.right
                 bottom: currentSelection.top
-                bottomMargin: hifi.dimensions.contentSpacing.y
+                bottomMargin: hifi.dimensions.contentSpacing.y + currentSelection.controlHeight - currentSelection.height
             }
             onDoubleClicked: navigateToRow(row);
             focus: true
@@ -293,11 +293,11 @@ ModalWindow {
 
         TextField {
             id: currentSelection
-            style:  TextFieldStyle { renderType: Text.QtRendering }
+            label: "Path:"
             anchors {
                 left: parent.left
                 right: root.selectDirectory ? parent.right : selectionType.left
-                rightMargin: hifi.dimensions.contentSpacing.x
+                rightMargin: root.selectDirectory ? 0 : hifi.dimensions.contentSpacing.x
                 bottom: buttonRow.top
                 bottomMargin: hifi.dimensions.contentSpacing.y
             }
diff --git a/interface/resources/qml/dialogs/fileDialog/FileTypeSelection.qml b/interface/resources/qml/dialogs/fileDialog/FileTypeSelection.qml
index 57ad2028ad..3d66b37b67 100644
--- a/interface/resources/qml/dialogs/fileDialog/FileTypeSelection.qml
+++ b/interface/resources/qml/dialogs/fileDialog/FileTypeSelection.qml
@@ -1,8 +1,18 @@
+//
+//  FileTypeSelection.qml
+//
+//  Created by Bradley Austin Davis on 29 Jan 2016
+//  Copyright 2015 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
 import QtQuick 2.5
 
-import "../../controls" as VrControls
+import "../../controls-uit"
 
-VrControls.ComboBox {
+ComboBox {
     id: root
     property string filtersString:  "All Files (*.*)";
     property var currentFilter: [ "*.*" ];