--- a/devtools/client/netmonitor/selectors/requests.js
+++ b/devtools/client/netmonitor/selectors/requests.js
@@ -88,32 +88,35 @@ const getDisplayedRequestsSummary = crea
     return {
       count: requests.size,
       bytes: totalBytes,
       millis: totalMillis,
     };
   }
 );
 
+const getSelectedRequest = createSelector(
+  state => state.requests,
+  requests => {
+    if (!requests.selectedId) {
+      return null;
+    }
+
+    return requests.requests.find(r => r.id === requests.selectedId);
+  }
+);
+
 function getRequestById(state, id) {
   return state.requests.requests.find(r => r.id === id);
 }
 
 function getDisplayedRequestById(state, id) {
   return getDisplayedRequests(state).find(r => r.id === id);
 }
 
-function getSelectedRequest(state) {
-  if (!state.requests.selectedId) {
-    return null;
-  }
-
-  return getRequestById(state, state.requests.selectedId);
-}
-
 module.exports = {
-  getSortedRequests,
+  getDisplayedRequestById,
   getDisplayedRequests,
   getDisplayedRequestsSummary,
   getRequestById,
-  getDisplayedRequestById,
   getSelectedRequest,
+  getSortedRequests,
 };