diff --git a/glade/torrent_menu.glade b/glade/torrent_menu.glade
index 7eb2ba93b..50b3e98ef 100644
--- a/glade/torrent_menu.glade
+++ b/glade/torrent_menu.glade
@@ -4,6 +4,22 @@
 <glade-interface>
   <widget class="GtkMenu" id="torrent_menu">
     <property name="visible">True</property>
+    <child>
+      <widget class="GtkImageMenuItem" id="menu_pause">
+        <property name="visible">True</property>
+        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+        <property name="label" translatable="yes">StartPause</property>
+        <property name="use_underline">True</property>
+        <child internal-child="image">
+          <widget class="GtkImage" id="menu-item-image9">
+            <property name="visible">True</property>
+            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+            <property name="stock">gtk-missing-image</property>
+            <property name="icon_size">1</property>
+          </widget>
+        </child>
+      </widget>
+    </child>
     <child>
       <widget class="GtkImageMenuItem" id="menuitem5">
         <property name="visible">True</property>
@@ -21,13 +37,113 @@
       </widget>
     </child>
     <child>
-      <widget class="GtkImageMenuItem" id="menuitem6">
+      <widget class="GtkImageMenuItem" id="menuitem2">
         <property name="visible">True</property>
-        <property name="label" translatable="yes">Queue Up</property>
+        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+        <property name="label" translatable="yes">Queue</property>
         <property name="use_underline">True</property>
-        <signal name="activate" handler="queue_up"/>
+        <child>
+          <widget class="GtkMenu" id="menu1">
+            <property name="visible">True</property>
+            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+            <child>
+              <widget class="GtkImageMenuItem" id="menuitem1">
+                <property name="visible">True</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="label" translatable="yes">Top</property>
+                <property name="use_underline">True</property>
+                <child internal-child="image">
+                  <widget class="GtkImage" id="menu-item-image10">
+                    <property name="visible">True</property>
+                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                    <property name="stock">gtk-goto-top</property>
+                    <property name="icon_size">1</property>
+                  </widget>
+                </child>
+              </widget>
+            </child>
+            <child>
+              <widget class="GtkImageMenuItem" id="menuitem6">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">Up</property>
+                <property name="use_underline">True</property>
+                <signal name="activate" handler="queue_up"/>
+                <child internal-child="image">
+                  <widget class="GtkImage" id="menu-item-image6">
+                    <property name="visible">True</property>
+                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                    <property name="stock">gtk-go-up</property>
+                    <property name="icon_size">1</property>
+                  </widget>
+                </child>
+              </widget>
+            </child>
+            <child>
+              <widget class="GtkImageMenuItem" id="menuitem7">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">Down</property>
+                <property name="use_underline">True</property>
+                <signal name="activate" handler="queue_down"/>
+                <child internal-child="image">
+                  <widget class="GtkImage" id="menu-item-image7">
+                    <property name="visible">True</property>
+                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                    <property name="stock">gtk-go-down</property>
+                    <property name="icon_size">1</property>
+                  </widget>
+                </child>
+              </widget>
+            </child>
+            <child>
+              <widget class="GtkImageMenuItem" id="menuitem8">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">Bottom</property>
+                <property name="use_underline">True</property>
+                <signal name="activate" handler="queue_bottom"/>
+                <child internal-child="image">
+                  <widget class="GtkImage" id="menu-item-image8">
+                    <property name="visible">True</property>
+                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                    <property name="stock">gtk-goto-bottom</property>
+                    <property name="icon_size">1</property>
+                  </widget>
+                </child>
+              </widget>
+            </child>
+          </widget>
+        </child>
         <child internal-child="image">
-          <widget class="GtkImage" id="menu-item-image6">
+          <widget class="GtkImage" id="menu-item-image11">
+            <property name="visible">True</property>
+            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+            <property name="stock">gtk-sort-ascending</property>
+            <property name="icon_size">1</property>
+          </widget>
+        </child>
+      </widget>
+    </child>
+    <child>
+      <widget class="GtkImageMenuItem" id="menuitem3">
+        <property name="visible">True</property>
+        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+        <property name="label" translatable="yes">Upload</property>
+        <property name="use_underline">True</property>
+        <child>
+          <widget class="GtkMenu" id="menu2">
+            <property name="visible">True</property>
+            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+            <child>
+              <widget class="GtkMenuItem" id="menuitem9">
+                <property name="visible">True</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="label" translatable="yes">menuitem9</property>
+                <property name="use_underline">True</property>
+              </widget>
+            </child>
+          </widget>
+        </child>
+        <child internal-child="image">
+          <widget class="GtkImage" id="menu-item-image12">
             <property name="visible">True</property>
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
             <property name="stock">gtk-go-up</property>
@@ -37,13 +153,27 @@
       </widget>
     </child>
     <child>
-      <widget class="GtkImageMenuItem" id="menuitem7">
+      <widget class="GtkImageMenuItem" id="menuitem4">
         <property name="visible">True</property>
-        <property name="label" translatable="yes">Queue Down</property>
+        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+        <property name="label" translatable="yes">Download</property>
         <property name="use_underline">True</property>
-        <signal name="activate" handler="queue_down"/>
+        <child>
+          <widget class="GtkMenu" id="menu3">
+            <property name="visible">True</property>
+            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+            <child>
+              <widget class="GtkMenuItem" id="menuitem11">
+                <property name="visible">True</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="label" translatable="yes">menuitem11</property>
+                <property name="use_underline">True</property>
+              </widget>
+            </child>
+          </widget>
+        </child>
         <child internal-child="image">
-          <widget class="GtkImage" id="menu-item-image7">
+          <widget class="GtkImage" id="menu-item-image13">
             <property name="visible">True</property>
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
             <property name="stock">gtk-go-down</property>
@@ -52,21 +182,5 @@
         </child>
       </widget>
     </child>
-    <child>
-      <widget class="GtkImageMenuItem" id="menuitem8">
-        <property name="visible">True</property>
-        <property name="label" translatable="yes">Queue to Bottom</property>
-        <property name="use_underline">True</property>
-        <signal name="activate" handler="queue_bottom"/>
-        <child internal-child="image">
-          <widget class="GtkImage" id="menu-item-image8">
-            <property name="visible">True</property>
-            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-            <property name="stock">gtk-goto-bottom</property>
-            <property name="icon_size">1</property>
-          </widget>
-        </child>
-      </widget>
-    </child>
   </widget>
 </glade-interface>
diff --git a/src/interface.py b/src/interface.py
index 395974d8f..5ebc62dc1 100644
--- a/src/interface.py
+++ b/src/interface.py
@@ -380,6 +380,13 @@ class DelugeGTK:
 			self.torrent_view.grab_focus()
 			self.torrent_view.set_cursor(path, col, 0)
 			unique_id = self.get_selected_torrent()
+			widget = self.torrent_glade.get_widget("menu_pause")
+			if(self.manager.is_user_paused(self.get_selected_torrent())):
+				widget.set_image(gtk.image_new_from_stock(gtk.STOCK_MEDIA_PLAY, gtk.ICON_SIZE_MENU))
+				widget.get_children()[0].set_text(_("Start"))
+			else:
+				widget.set_image(gtk.image_new_from_stock(gtk.STOCK_MEDIA_PAUSE, gtk.ICON_SIZE_MENU))
+				widget.get_children()[0].set_text(_("Pause"))
 			
 			self.torrent_menu.popup(None, None, None, event.button, event.time)