diff --git a/TODO b/TODO
index ac5c61944..c6ec2b9d2 100644
--- a/TODO
+++ b/TODO
@@ -185,27 +185,9 @@ Lock tab [n]. Locking a tab will lock this tab to the current uri, it’s not po
 wf
 Show hints, open link in a new tab. (command hints_win, aliases: winhints, whi).
 
-;o
-Set hint’s url in commandline (command hints_url, aliases: uhints, uhi).
-
-;O
-Set hint’s url in commandline, open in a new tab (command hints_url_tab, aliases: utabhints, uthi).
-
-.o
-Set hint’s url in commandline, open in a background tab (command hints_url_background, aliases: ubackhints).
-
 ;d
 Download via hints (command hints_download, aliases: dhints).
 
-;y
-Save link location to clipboard (command hints_clipboard, aliases: chints, chi).
-
-;Y
-Save link location to primary selection (command hints_primary, aliases: phints, phi).
-
-;r
-Rapid hint mode, each matching hint opens a new tab in background. (command hints_rapid, aliases: rhints, rhi).
-
 ;R
 Rapid hint mode, each matching hint opens a new window. (command hints_rapid_win, aliases: wrhints, wrhi).
 
diff --git a/qutebrowser/browser/hints.py b/qutebrowser/browser/hints.py
index 8acebb84d..d682b6066 100644
--- a/qutebrowser/browser/hints.py
+++ b/qutebrowser/browser/hints.py
@@ -22,7 +22,8 @@ import math
 from collections import namedtuple
 
 from PyQt5.QtCore import pyqtSignal, QObject, QEvent, Qt
-from PyQt5.QtGui import QMouseEvent
+from PyQt5.QtGui import QMouseEvent, QClipboard
+from PyQt5.QtWidgets import QApplication
 
 import qutebrowser.config.config as config
 import qutebrowser.utils.message as message
@@ -90,6 +91,10 @@ class HintManager(QObject):
         _frame: The QWebFrame to use.
         _elems: A mapping from keystrings to (elem, label) namedtuples.
         _target: What to do with the opened links.
+                 "normal"/"tab"/"bgtab": Get passed to BrowserTab.
+                 "yank"/"yank_primary": Yank to clipboard/primary selection
+                 "cmd"/"cmd_tab"/"cmd_bgtab": Enter link to commandline
+                 "rapid": Rapid mode with background tabs
 
     Signals:
         hint_strings_updated: Emitted when the possible hint strings changed.
@@ -102,6 +107,7 @@ class HintManager(QObject):
                  arg 0: URL to open as a string.
                  arg 1: true if it should be opened in a new tab, else false.
         set_open_target: Set a new target to open the links in.
+        set_cmd_text: Emitted when the commandline text should be set.
     """
 
     SELECTORS = {
@@ -133,6 +139,7 @@ class HintManager(QObject):
     set_mode = pyqtSignal(str)
     mouse_event = pyqtSignal('QMouseEvent')
     set_open_target = pyqtSignal(str)
+    set_cmd_text = pyqtSignal(str)
 
     def __init__(self, frame):
         """Constructor.
@@ -375,21 +382,21 @@ class HintManager(QObject):
     def fire(self, keystr):
         """Fire a completed hint."""
         elem = self._elems[keystr].elem
-        self.set_open_target.emit(self._target)
-        self.stop()
-        point = elem.geometry().topLeft()
-        scrollpos = self._frame.scrollPosition()
-        logging.debug("Clicking on \"{}\" at {}/{} - {}/{}".format(
-            elem.toPlainText(), point.x(), point.y(), scrollpos.x(),
-            scrollpos.y()))
-        point -= scrollpos
-        events = [
-            QMouseEvent(QEvent.MouseMove, point, Qt.NoButton, Qt.NoButton,
-                        Qt.NoModifier),
-            QMouseEvent(QEvent.MouseButtonPress, point, Qt.LeftButton,
-                        Qt.NoButton, Qt.NoModifier),
-            QMouseEvent(QEvent.MouseButtonRelease, point, Qt.LeftButton,
-                        Qt.NoButton, Qt.NoModifier),
-        ]
-        for evt in events:
-            self.mouse_event.emit(evt)
+        target = self._target
+        if target != 'rapid':
+            self.stop()
+
+        if target in ['normal', 'tab', 'bgtab']:
+            self._click(elem, target)
+        elif target == 'rapid':
+            self._click(elem, 'bgtab')
+        elif target in ['yank', 'yank_primary']:
+            sel = target == 'yank_primary'
+            self._yank(elem, sel)
+        elif target in ['cmd', 'cmd_tab', 'cmd_bgtab']:
+            commands = {
+                'cmd': 'open',
+                'cmd_tab': 'tabopen',
+                'cmd_bgtab': 'backtabopen',
+            }
+            self._set_cmd_text(elem, commands[target])
diff --git a/qutebrowser/config/configdata.py b/qutebrowser/config/configdata.py
index 44f11297e..5794c911d 100644
--- a/qutebrowser/config/configdata.py
+++ b/qutebrowser/config/configdata.py
@@ -356,6 +356,12 @@ DATA = OrderedDict([
         (';I', 'hint images tab'),
         ('.i', 'hint images bgtab'),
         (';e', 'hint editable'),
+        (';o', 'hint links cmd'),
+        (';O', 'hint links cmd_tab'),
+        ('.o', 'hint links cmd_bgtab'),
+        (';y', 'hint links yank'),
+        (';Y', 'hint links yank_primary'),
+        (';r', 'hint links rapid'),
         ('h', 'scroll -50 0'),
         ('j', 'scroll 0 50'),
         ('k', 'scroll 0 -50'),
diff --git a/qutebrowser/widgets/tabbedbrowser.py b/qutebrowser/widgets/tabbedbrowser.py
index c676fad9b..6b555397f 100644
--- a/qutebrowser/widgets/tabbedbrowser.py
+++ b/qutebrowser/widgets/tabbedbrowser.py
@@ -247,6 +247,7 @@ class TabbedBrowser(TabWidget):
         tab.titleChanged.connect(self._titleChanged_handler)
         tab.hintmanager.hint_strings_updated.connect(self.hint_strings_updated)
         tab.hintmanager.set_mode.connect(self.set_mode)
+        tab.hintmanager.set_cmd_text.connect(self.set_cmd_text)
         # FIXME sometimes this doesn't load
         tab.show()
         tab.open_tab.connect(self.tabopen)