diff --git a/common/content/buffer.js b/common/content/buffer.js
index 161a09d5..cc2f1eae 100644
--- a/common/content/buffer.js
+++ b/common/content/buffer.js
@@ -579,9 +579,7 @@ var Buffer = Module("buffer", {
      * @property {nsISelectionController} The current document's selection
      *     controller.
      */
-    get selectionController() config.browser.docShell
-            .QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsISelectionDisplay)
-            .QueryInterface(Ci.nsISelectionController),
+    get selectionController() util.selectionController(this.focusedFrame),
 
     /**
      * Opens the appropriate context menu for *elem*.
diff --git a/pentadactyl/Makefile b/pentadactyl/Makefile
index 810d7c4c..daf282e5 100644
--- a/pentadactyl/Makefile
+++ b/pentadactyl/Makefile
@@ -6,7 +6,7 @@ FIREFOX      ?= firefox
 HOSTAPP      ?= $(FIREFOX)
 PROFILEPATHS ?= "$$HOME/.mozilla/firefox" \
 		"$$HOME/Library/Application Support/Firefox" \
-		"$$APPDATA/Mozilla/Firefox" \
-		"$$AppData/Mozilla/Firefox"
+		"$$APPDATA/Mozilla/Firefox/Profiles" \
+		"$$AppData/Mozilla/Firefox/Profiles"
 
 include ../common/Makefile