diff --git a/src/libtomahawk/filemetadata/MetadataEditor.cpp b/src/libtomahawk/filemetadata/MetadataEditor.cpp
index 66ae219b5..a32a0e896 100644
--- a/src/libtomahawk/filemetadata/MetadataEditor.cpp
+++ b/src/libtomahawk/filemetadata/MetadataEditor.cpp
@@ -90,6 +90,11 @@ MetadataEditor::writeMetadata()
     tag->setTrack( discnumber() );
     m_result->setDiscNumber( discnumber() );
 
+    if ( year() != m_result->year() ) {
+        tag->setYear( year() );
+        m_result->setYear( year() );
+    }
+
     f.save();
 
     QStringList files = QStringList( fileName );
@@ -136,14 +141,14 @@ MetadataEditor::setDuration( unsigned int duration )
 void
 MetadataEditor::setYear( int year )
 {
-    ui->yearLineEdit->setText( QString( "%1" ).arg( year ) );
+    ui->yearSpinBox->setValue( year );
 }
 
 
 void
 MetadataEditor::setBitrate( unsigned int bitrate )
 {
-    ui->bitrateLineEdit->setText( QString( "%1" ).arg( bitrate ) );
+    ui->bitrateSpinBox->setValue( bitrate );
 }
 
 
diff --git a/src/libtomahawk/filemetadata/MetadataEditor.h b/src/libtomahawk/filemetadata/MetadataEditor.h
index b41e593f2..d66de1db1 100644
--- a/src/libtomahawk/filemetadata/MetadataEditor.h
+++ b/src/libtomahawk/filemetadata/MetadataEditor.h
@@ -38,10 +38,13 @@ public:
     MetadataEditor( Tomahawk::result_ptr result, QWidget* parent = 0 );
     ~MetadataEditor() {};
 
+protected:
     QString title() { return ui->titleLineEdit->text(); }
     QString artist() { return ui->artistLineEdit->text(); }
     QString album() { return ui->albumLineEdit->text(); }
     int discnumber() { return ui->discNumberSpinBox->value(); }
+    int year() { return ui->yearSpinBox->value(); }
+    int bitrate() { return ui->bitrateSpinBox->value(); }
 
 private slots:
     void writeMetadata();
diff --git a/src/libtomahawk/filemetadata/MetadataEditor.ui b/src/libtomahawk/filemetadata/MetadataEditor.ui
index 89bf978ae..4291ee6e5 100644
--- a/src/libtomahawk/filemetadata/MetadataEditor.ui
+++ b/src/libtomahawk/filemetadata/MetadataEditor.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>404</width>
-    <height>298</height>
+    <width>441</width>
+    <height>323</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -25,7 +25,7 @@
      <property name="currentIndex">
       <number>0</number>
      </property>
-     <widget class="QWidget" name="tabWidgetPage1" native="true">
+     <widget class="QWidget" name="tabWidgetPage1">
       <attribute name="title">
        <string>Tags</string>
       </attribute>
@@ -130,6 +130,32 @@
          </property>
         </widget>
        </item>
+       <item row="17" column="0">
+        <widget class="QLabel" name="label_9">
+         <property name="text">
+          <string>Year:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="17" column="1">
+        <widget class="QSpinBox" name="yearSpinBox">
+         <property name="minimumSize">
+          <size>
+           <width>76</width>
+           <height>0</height>
+          </size>
+         </property>
+         <property name="buttonSymbols">
+          <enum>QAbstractSpinBox::NoButtons</enum>
+         </property>
+         <property name="minimum">
+          <number>1900</number>
+         </property>
+         <property name="maximum">
+          <number>2999</number>
+         </property>
+        </widget>
+       </item>
        <item row="19" column="0">
         <widget class="QLabel" name="label_4">
          <property name="text">
@@ -138,29 +164,15 @@
         </widget>
        </item>
        <item row="19" column="1">
-        <widget class="QLineEdit" name="bitrateLineEdit">
+        <widget class="QSpinBox" name="bitrateSpinBox">
          <property name="readOnly">
           <bool>true</bool>
          </property>
-         <property name="placeholderText">
-          <string>Bitrate...</string>
+         <property name="buttonSymbols">
+          <enum>QAbstractSpinBox::NoButtons</enum>
          </property>
-        </widget>
-       </item>
-       <item row="17" column="1">
-        <widget class="QLineEdit" name="yearLineEdit">
-         <property name="readOnly">
-          <bool>true</bool>
-         </property>
-         <property name="placeholderText">
-          <string>Year...</string>
-         </property>
-        </widget>
-       </item>
-       <item row="17" column="0">
-        <widget class="QLabel" name="label_9">
-         <property name="text">
-          <string>Year:</string>
+         <property name="maximum">
+          <number>999999</number>
          </property>
         </widget>
        </item>