diff --git a/include/ExportProjectDialog.h b/include/ExportProjectDialog.h
index 5ac70bb8f..d7159780f 100644
--- a/include/ExportProjectDialog.h
+++ b/include/ExportProjectDialog.h
@@ -53,6 +53,8 @@ private slots:
 	void accept();
 	void startExport();
 
+	void onFileFormatChanged(int);
+
 private:
 	QString m_fileName;
 	QString m_dirName;
diff --git a/src/gui/ExportProjectDialog.cpp b/src/gui/ExportProjectDialog.cpp
index 3f8c36abb..8c55e382f 100644
--- a/src/gui/ExportProjectDialog.cpp
+++ b/src/gui/ExportProjectDialog.cpp
@@ -171,7 +171,35 @@ void ExportProjectDialog::startExport()
 }
 
 
+ProjectRenderer::ExportFileFormats convertIndexToExportFileFormat(int index)
+{
+	switch (index)
+	{
+	case 0:
+		return ProjectRenderer::WaveFile;
+	case 1:
+		return ProjectRenderer::OggFile;
+	default:
+		Q_ASSERT(false);
+		break;
+	}
 
+	return ProjectRenderer::NumFileFormats;
+}
+
+
+void ExportProjectDialog::onFileFormatChanged(int index)
+{
+	ProjectRenderer::ExportFileFormats exportFormat =
+			convertIndexToExportFileFormat(index);
+
+	bool bitRateControlsEnabled = exportFormat == ProjectRenderer::OggFile;
+	bool bitDepthControlEnabled = exportFormat == ProjectRenderer::WaveFile;
+
+	bitrateWidget->setVisible(bitRateControlsEnabled);
+
+	depthWidget->setVisible(bitDepthControlEnabled);
+}
 
 void ExportProjectDialog::startBtnClicked()
 {
diff --git a/src/gui/dialogs/export_project.ui b/src/gui/dialogs/export_project.ui
index 4384993af..2225a6495 100644
--- a/src/gui/dialogs/export_project.ui
+++ b/src/gui/dialogs/export_project.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>519</width>
-    <height>412</height>
+    <width>715</width>
+    <height>447</height>
    </rect>
   </property>
   <property name="minimumSize">
@@ -80,6 +80,47 @@
           </item>
          </widget>
         </item>
+        <item>
+         <widget class="QWidget" name="depthWidget" native="true">
+          <property name="minimumSize">
+           <size>
+            <width>0</width>
+            <height>20</height>
+           </size>
+          </property>
+          <layout class="QVBoxLayout">
+           <property name="margin">
+            <number>0</number>
+           </property>
+           <item>
+            <widget class="QLabel" name="labelBitDepth">
+             <property name="text">
+              <string>Depth:</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QComboBox" name="depthCB">
+             <item>
+              <property name="text">
+               <string>16 Bit Integer</string>
+              </property>
+             </item>
+             <item>
+              <property name="text">
+               <string>24 Bit Float</string>
+              </property>
+             </item>
+             <item>
+              <property name="text">
+               <string>32 Bit Float</string>
+              </property>
+             </item>
+            </widget>
+           </item>
+          </layout>
+         </widget>
+        </item>
         <item>
          <widget class="QWidget" name="bitrateWidget" native="true">
           <layout class="QVBoxLayout">
@@ -90,7 +131,7 @@
             <number>0</number>
            </property>
            <item>
-            <widget class="QLabel" name="label_5">
+            <widget class="QLabel" name="labelBitRate">
              <property name="text">
               <string>Bitrate:</string>
              </property>
@@ -136,67 +177,6 @@
           </layout>
          </widget>
         </item>
-        <item>
-         <widget class="QWidget" name="depthWidget" native="true">
-          <layout class="QVBoxLayout">
-           <property name="margin">
-            <number>0</number>
-           </property>
-           <item>
-            <widget class="QLabel" name="label_6">
-             <property name="text">
-              <string>Depth:</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QComboBox" name="depthCB">
-             <item>
-              <property name="text">
-               <string>16 Bit Integer</string>
-              </property>
-             </item>
-             <item>
-              <property name="text">
-               <string>24 Bit Float</string>
-              </property>
-             </item>
-             <item>
-              <property name="text">
-               <string>32 Bit Float</string>
-              </property>
-             </item>
-            </widget>
-           </item>
-          </layout>
-         </widget>
-        </item>
-        <item>
-         <spacer>
-          <property name="orientation">
-           <enum>Qt::Vertical</enum>
-          </property>
-          <property name="sizeType">
-           <enum>QSizePolicy::Fixed</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>1</width>
-            <height>10</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item>
-         <widget class="QLabel" name="label_7">
-          <property name="text">
-           <string>Please note that not all of the parameters above apply for all file formats.</string>
-          </property>
-          <property name="wordWrap">
-           <bool>true</bool>
-          </property>
-         </widget>
-        </item>
         <item>
          <spacer>
           <property name="orientation">
@@ -368,8 +348,8 @@
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>357</x>
-     <y>293</y>
+     <x>511</x>
+     <y>372</y>
     </hint>
     <hint type="destinationlabel">
      <x>202</x>
@@ -377,5 +357,24 @@
     </hint>
    </hints>
   </connection>
+  <connection>
+   <sender>fileFormatCB</sender>
+   <signal>currentIndexChanged(int)</signal>
+   <receiver>ExportProjectDialog</receiver>
+   <slot>onFileFormatChanged(int)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>111</x>
+     <y>85</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>518</x>
+     <y>212</y>
+    </hint>
+   </hints>
+  </connection>
  </connections>
+ <slots>
+  <slot>onFileFormatChanged(int)</slot>
+ </slots>
 </ui>