diff --git a/src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/ExtraTrackDetailsPage.cs b/src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/ExtraTrackDetailsPage.cs
index 27e08cb..60caa90 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/ExtraTrackDetailsPage.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/ExtraTrackDetailsPage.cs
@@ -112,6 +112,13 @@ namespace Banshee.Gui.TrackEditor
                 delegate (EditorTrackInfo track, Widget widget) { ((TextViewEntry)widget).Text = track.Comment; },
                 delegate (EditorTrackInfo track, Widget widget) { track.Comment = ((TextViewEntry)widget).Text; }
             );
+
+            AddField (this, new MediaTypeComboBox (),
+                Catalog.GetString ("Set the media type"),
+                delegate { return Catalog.GetString ("M_edia Type:"); },
+                delegate (EditorTrackInfo track, Widget widget) { ((MediaTypeComboBox)widget).ActiveValue = track.MediaAttributes; },
+                delegate (EditorTrackInfo track, Widget widget) { track.MediaAttributes = ((MediaTypeComboBox)widget).ActiveValue; }
+            );
         }
     }
 }
diff --git a/src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/MediaTypeComboBox.cs b/src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/MediaTypeComboBox.cs
new file mode 100644
index 0000000..11540b3
--- /dev/null
+++ b/src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/MediaTypeComboBox.cs
@@ -0,0 +1,60 @@
+//
+// MediaTypeComboBox.cs
+//
+// Author:
+//   Jensen Somers <jensen.somers@gmail.com>
+//
+// Copyright (C) 2009 Jensen Somers.
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+
+using Gtk;
+
+using Hyena.Gui;
+
+using Banshee.Collection;
+using Banshee.Widgets;
+
+using Mono.Unix;
+
+namespace Banshee.Gui.TrackEditor
+{
+    public class MediaTypeComboBox : DictionaryComboBox<TrackMediaAttributes>, IEditorField
+    {
+        public MediaTypeComboBox ()
+        {
+            Clear ();
+            
+            Add (Catalog.GetString ("Audio/Video"), TrackMediaAttributes.None);
+            Add (Catalog.GetString ("Audio"), TrackMediaAttributes.AudioStream | TrackMediaAttributes.Music);
+            Add (Catalog.GetString ("Video"), TrackMediaAttributes.VideoStream | TrackMediaAttributes.Movie);
+            Add (Catalog.GetString ("Podcast"), TrackMediaAttributes.AudioStream | TrackMediaAttributes.Podcast);
+            Add (Catalog.GetString ("Video Podcast"), TrackMediaAttributes.VideoStream | TrackMediaAttributes.Podcast);
+            Add (Catalog.GetString ("Audiobook"), TrackMediaAttributes.AudioStream | TrackMediaAttributes.AudioBook);
+            Add (Catalog.GetString ("Music Video"), TrackMediaAttributes.VideoStream | TrackMediaAttributes.Music);
+            Add (Catalog.GetString ("TV Show"), TrackMediaAttributes.VideoStream | TrackMediaAttributes.TvShow);
+
+            ActiveValue = TrackMediaAttributes.None;
+        }
+    }
+}
diff --git a/src/Core/Banshee.ThickClient/Banshee.ThickClient.csproj b/src/Core/Banshee.ThickClient/Banshee.ThickClient.csproj
index 4893796..0c1ea73 100644
--- a/src/Core/Banshee.ThickClient/Banshee.ThickClient.csproj
+++ b/src/Core/Banshee.ThickClient/Banshee.ThickClient.csproj
@@ -276,6 +274,7 @@
     <Compile Include="Banshee.ContextPane\BaseContextPage.cs" />
     <Compile Include="Banshee.ContextPane\ContextPageManager.cs" />
     <Compile Include="Banshee.ContextPane\ContextPane.cs" />
+    <Compile Include="Banshee.Gui.TrackEditor\MediaTypeComboBox.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
\ No newline at end of file
diff --git a/src/Core/Banshee.ThickClient/Makefile.am b/src/Core/Banshee.ThickClient/Makefile.am
index d53e769..c19fe8f 100644
--- a/src/Core/Banshee.ThickClient/Makefile.am
+++ b/src/Core/Banshee.ThickClient/Makefile.am
@@ -72,6 +72,7 @@ SOURCES =  \
 	Banshee.Gui.TrackEditor/ITrackEditorPage.cs \
 	Banshee.Gui.TrackEditor/LicenseEntry.cs \
 	Banshee.Gui.TrackEditor/LyricsPage.cs \
+	Banshee.Gui.TrackEditor/MediaTypeComboBox.cs \
 	Banshee.Gui.TrackEditor/PageNavigationEntry.cs \
 	Banshee.Gui.TrackEditor/PageType.cs \
 	Banshee.Gui.TrackEditor/RangeEntry.cs \
