diff --git a/demo/main.js b/demo/main.js
index 00e675f5..a9b11655 100644
--- a/demo/main.js
+++ b/demo/main.js
@@ -35,21 +35,6 @@ function setPadding() {
 
 createTerminal();
 
-addDomListener(paddingElement, 'change', setPadding);
-
-addDomListener(actionElements.findNext, 'keypress', function (e) {
-  if (e.key === "Enter") {
-    e.preventDefault();
-    term.findNext(actionElements.findNext.value);
-  }
-});
-addDomListener(actionElements.findPrevious, 'keypress', function (e) {
-  if (e.key === "Enter") {
-    e.preventDefault();
-    term.findPrevious(actionElements.findPrevious.value);
-  }
-});
-
 const disposeRecreateButtonHandler = () => {
   // If the terminal exists dispose of it, otherwise recreate it
   if (term) {
@@ -93,6 +78,21 @@ function createTerminal() {
   term.fit();
   term.focus();
 
+  addDomListener(paddingElement, 'change', setPadding);
+
+  addDomListener(actionElements.findNext, 'keypress', function (e) {
+    if (e.key === "Enter") {
+      e.preventDefault();
+      term.findNext(actionElements.findNext.value);
+    }
+  });
+  addDomListener(actionElements.findPrevious, 'keypress', function (e) {
+    if (e.key === "Enter") {
+      e.preventDefault();
+      term.findPrevious(actionElements.findPrevious.value);
+    }
+  });
+
   // fit is called within a setTimeout, cols and rows need this.
   setTimeout(function () {
     initOptions(term);