diff --git a/src/libtomahawk/ContextMenu.cpp b/src/libtomahawk/ContextMenu.cpp
index d03ff389f..83655223c 100644
--- a/src/libtomahawk/ContextMenu.cpp
+++ b/src/libtomahawk/ContextMenu.cpp
@@ -119,7 +119,7 @@ ContextMenu::setQueries( const QList<Tomahawk::query_ptr>& queries )
         Tomahawk::result_ptr result = m_queries.first()->results().first();
         if ( result->collection() && result->collection()->source() &&
              result->collection()->source()->isLocal() ) {
-            m_sigmap->setMapping( addAction( tr( "Edit Metadata") ), ActionEditMetadata );
+            m_sigmap->setMapping( addAction( tr( "Properties") ), ActionEditMetadata );
         }
     }
 
diff --git a/src/libtomahawk/filemetadata/.MetadataEditor.cpp.swp b/src/libtomahawk/filemetadata/.MetadataEditor.cpp.swp
deleted file mode 100644
index 4f81dec98..000000000
Binary files a/src/libtomahawk/filemetadata/.MetadataEditor.cpp.swp and /dev/null differ
diff --git a/src/libtomahawk/filemetadata/MetadataEditor.cpp b/src/libtomahawk/filemetadata/MetadataEditor.cpp
index 378b120f2..00aad4fb7 100644
--- a/src/libtomahawk/filemetadata/MetadataEditor.cpp
+++ b/src/libtomahawk/filemetadata/MetadataEditor.cpp
@@ -39,13 +39,14 @@ MetadataEditor::MetadataEditor( Tomahawk::result_ptr result, QWidget *parent )
     , m_result( result )
 {
     ui->setupUi( this );
-    setWindowTitle( QString( result->track() + tr( " Properties" ) ) );
+    setWindowTitle( QString( result->track() + tr( " - Properties" ) ) );
     setAttribute( Qt::WA_DeleteOnClose );
 
     setTitle( result->track() );
     setArtist( result->artist()->name() );
     setAlbum( result->album()->name() );
     setDiscNumber( result->albumpos() );
+    setBitrate( result->bitrate() );
 
     connect( ui->buttonBox, SIGNAL( accepted() ), SLOT( writeMetadata() ) );
     connect( ui->buttonBox, SIGNAL( rejected() ), SLOT( close() ) );
@@ -117,3 +118,9 @@ MetadataEditor::setDiscNumber( unsigned int num )
     ui->discNumberSpinBox->setValue( num );
 }
 
+
+void
+MetadataEditor::setBitrate( unsigned int bitrate )
+{
+    ui->bitrateLabel->setNum( (int) bitrate );
+}
diff --git a/src/libtomahawk/filemetadata/MetadataEditor.h b/src/libtomahawk/filemetadata/MetadataEditor.h
index 79f3ff32f..9cfdebec4 100644
--- a/src/libtomahawk/filemetadata/MetadataEditor.h
+++ b/src/libtomahawk/filemetadata/MetadataEditor.h
@@ -50,6 +50,7 @@ private slots:
     void setArtist( const QString& artist );
     void setAlbum( const QString& album );
     void setDiscNumber( unsigned int num );
+    void setBitrate( unsigned int num );
 
 private:
     Ui::MetadataEditor* ui;
diff --git a/src/libtomahawk/filemetadata/MetadataEditor.ui b/src/libtomahawk/filemetadata/MetadataEditor.ui
index c690c8bb9..4a50ed573 100644
--- a/src/libtomahawk/filemetadata/MetadataEditor.ui
+++ b/src/libtomahawk/filemetadata/MetadataEditor.ui
@@ -42,7 +42,7 @@
       <item row="0" column="1">
        <widget class="QLineEdit" name="titleLineEdit">
         <property name="alignment">
-         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+         <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
         </property>
         <property name="placeholderText">
          <string>Title...</string>
@@ -52,7 +52,7 @@
       <item row="5" column="1">
        <widget class="QLineEdit" name="artistLineEdit">
         <property name="alignment">
-         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+         <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
         </property>
         <property name="placeholderText">
          <string>Artist...</string>
@@ -62,7 +62,7 @@
       <item row="9" column="1">
        <widget class="QLineEdit" name="albumLineEdit">
         <property name="alignment">
-         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+         <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
         </property>
         <property name="placeholderText">
          <string>Album...</string>
@@ -81,7 +81,7 @@
          <enum>Qt::LeftToRight</enum>
         </property>
         <property name="alignment">
-         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+         <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
         </property>
         <property name="buttonSymbols">
          <enum>QAbstractSpinBox::NoButtons</enum>
@@ -112,6 +112,20 @@
         </property>
        </widget>
       </item>
+      <item row="13" column="0">
+       <widget class="QLabel" name="label_4">
+        <property name="text">
+         <string>Bitrate:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="13" column="1">
+       <widget class="QLabel" name="bitrateLabel">
+        <property name="text">
+         <string/>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>