diff --git a/src/App.js b/src/App.js
index c29b96a..5ec1130 100644
--- a/src/App.js
+++ b/src/App.js
@@ -142,7 +142,10 @@ export default function App() {
       <div>
         <ChangeFloor currentFloor={currentFloor} callbackFloorChanged={setCurrentFloor} />
         <Divider />
-        <RoomResearch callbackRoomSelected={setSelectedRoom} />
+        <RoomResearch callbackRoomSelected={(floor, room) => {
+          setCurrentFloor(floor);
+          setSelectedRoom(room);
+        }} />
       </div>
     </div>
   </>
diff --git a/src/Rooms.js b/src/Rooms.js
index cf52073..bd2f951 100644
--- a/src/Rooms.js
+++ b/src/Rooms.js
@@ -15,9 +15,14 @@ export default function Rooms({rooms, callbackRoomSelected}) {
       </TableHead>
       <TableBody>
         {rooms.map((room) => {
-          return <TableRow hover={true} onClick={() => callbackRoomSelected(room['idRoom'])}>
-            <TableCell>{room['idRoom']}</TableCell>
-          </TableRow>
+          return <>
+            <TableRow
+              hover={true}
+              onClick={() => callbackRoomSelected(room['idFloors'][0], room['idRoom'])}
+            >
+              <TableCell>{room['idRoom']}</TableCell>
+            </TableRow>
+          </>
         })}
       </TableBody>
     </Table>