diff --git a/hgext3rd/interactiveui.py b/hgext3rd/interactiveui.py
new file mode 100644
--- /dev/null
+++ b/hgext3rd/interactiveui.py
@@ -0,0 +1,129 @@
+# interactiveui.py: display information and allow for left/right control
+#
+# Copyright 2017 Facebook, Inc.
+#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2 or any later version.
+
+from __future__ import absolute_import
+
+import os
+import sys
+import termios
+import tty
+
+def clearline():
+    w = sys.stdout
+    # ANSI
+    # ESC[#A : up # lines
+    # ESC[K : clear to end of line
+    w.write('\033[1A\033[K')
+    w.flush()
+
+# From:
+# https://github.com/pallets/click/blob/master/click/_termui_impl.py#L534
+# As per licence:
+# Copyright (c) 2014 by Armin Ronacher.
+#
+# Click uses parts of optparse written by Gregory P. Ward and maintained by
+# the Python software foundation.  This is limited to code in the parser.py
+# module:
+#
+# Copyright (c) 2001-2006 Gregory P. Ward.  All rights reserved.
+# Copyright (c) 2002-2006 Python Software Foundation.  All rights reserved.
+#
+# Some rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#    * Redistributions of source code must retain the above copyright
+#      notice, this list of conditions and the following disclaimer.
+#
+#    * Redistributions in binary form must reproduce the above
+#      copyright notice, this list of conditions and the following
+#      disclaimer in the documentation and/or other materials provided
+#      with the distribution.
+#
+#    * The names of the contributors may not be used to endorse or
+#      promote products derived from this software without specific
+#      prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# Note: some changes have been made from the source code
+
+def getchar(fd):
+    if not os.isatty(fd):
+        # TODO: figure out tests
+        return None
+    try:
+        attr = termios.tcgetattr(fd)
+        try:
+            tty.setraw(fd)
+            ch = os.read(fd, 32)
+        finally:
+            termios.tcsetattr(fd, termios.TCSADRAIN, attr)
+    except termios.error:
+        if ch is None:
+            ch = ''
+    if ch == '\x03':
+        raise KeyboardInterrupt()
+    if ch == '\x04':
+        raise EOFError()
+    return ch
+
+# End of code from link
+
+class viewframe(object):
+    # framework for view
+    def __init__(self, ui, repo, index):
+        self.ui = ui
+        self.repo = repo
+        self.index = index
+    def render():
+        # returns string to print
+        pass
+    def enter():
+        # handle user keypress return
+        pass
+    def leftarrow():
+        # handle user keypress left arrow
+        pass
+    def rightarrow():
+        # handle user keypress right arrow
+        pass
+
+def view(viewobj):
+    done = False
+    s = viewobj.render()
+    print(s)
+    while not done:
+        output = getchar(sys.stdin.fileno())
+        if repr(output) == '\'q\'':
+            done = True
+            break
+        if repr(output) == '\'\\r\'':
+            # \r = return
+            viewobj.enter()
+            done = True
+            break
+        if repr(output) == '\'\\x1b[C\'':
+            viewobj.rightarrow()
+        if repr(output) == '\'\\x1b[D\'':
+            viewobj.leftarrow()
+        for i in range(len(s.split("\n"))):
+            clearline()
+        s = viewobj.render()
+        print(s)
diff --git a/hgext3rd/undo.py b/hgext3rd/undo.py
--- a/hgext3rd/undo.py
+++ b/hgext3rd/undo.py
@@ -513,6 +513,7 @@
     ('b', 'branch', "", _("local branch undo, accepts commit hash "
                           "(ADVANCED)")),
     ('f', 'force', False, _("undo across missing undo history (ADVANCED)")),
+    ('i', 'interactive', False, _("use interactive ui for undo")),
     ('k', 'keep', False, _("keep working copy changes")),
     ('n', 'index', 1, _("how many steps to undo back")),
     ('p', 'preview', False, _("see smartlog like preview of future undo "
@@ -573,6 +574,9 @@
     keep = opts.get("keep")
     branch = opts.get("branch")
     preview = opts.get("preview")
+    interactive = opts.get("interactive")
+    if interactive:
+        preview = True
 
     if branch and reverseindex != 1:
         raise error.Abort(_("--branch with --index not supported"))
@@ -580,8 +584,42 @@
         reverseindex = _computerelative(repo, reverseindex,
                                         absolute = not relativeundo,
                                         branch = branch)
+    if branch and preview:
+        raise error.Abort(_("--branch with --preview not supported"))
 
-    if preview:
+    if interactive:
+        try:
+            interactiveui = extensions.find('interactiveui')
+        except KeyError:
+            raise error.Abort(_('undo --interactive requires interactiveui to '
+                                'work'))
+            return
+
+        class undopreview(interactiveui.viewframe):
+            def init(self, repo, ui, index):
+                self.repo = repo
+                self.ui = ui
+                self.index = index
+            def render(self):
+                ui = self.ui
+                ui.pushbuffer()
+                _preview(ui, self.repo, self.index)
+                return ui.popbuffer()
+            def rightarrow(self):
+                self.index += 1
+            def leftarrow(self):
+                self.index -= 1
+            def enter(self):
+                del opts["preview"]
+                del opts["interactive"]
+                opts["absolute"] = "absolute"
+                opts["index"] = self.index
+                undo(ui, repo, *args, **opts)
+                return
+        viewobj = undopreview(ui, repo, reverseindex)
+        interactiveui.view(viewobj)
+        return
+    elif preview:
         _preview(ui, repo, reverseindex)
         return