diff --git a/js/ui/telepathyClient.js b/js/ui/telepathyClient.js
index ab90579a3..4056679d9 100644
--- a/js/ui/telepathyClient.js
+++ b/js/ui/telepathyClient.js
@@ -11,6 +11,7 @@ const Tp = imports.gi.TelepathyGLib;
 const Gettext = imports.gettext.domain('gnome-shell');
 const _ = Gettext.gettext;
 
+const History = imports.misc.history;
 const Main = imports.ui.main;
 const MessageTray = imports.ui.messageTray;
 
@@ -291,6 +292,8 @@ Notification.prototype = {
             this._oldMaxScrollAdjustment = adjustment.upper;
         }));
 
+        this._inputHistory = new History.HistoryManager({ entry: this._responseEntry.clutter_text });
+
         this._history = [];
         this._timestampTimeoutId = 0;
     },
@@ -392,6 +395,8 @@ Notification.prototype = {
         if (text == '')
             return;
 
+        this._inputHistory.addItem(text);
+
         // Telepathy sends out the Sent signal for us.
         // see Source._messageSent
         this._responseEntry.set_text('');