diff --git a/src/editor/components/components/Sidebar.js b/src/editor/components/components/Sidebar.js
index e0b53a62..85adc1c0 100644
--- a/src/editor/components/components/Sidebar.js
+++ b/src/editor/components/components/Sidebar.js
@@ -125,8 +125,8 @@ export default class Sidebar extends React.Component {
                 onClick={this.toggleRightBar}
                 className="relative flex items-center justify-end"
               >
-                <div className="group flex items-center cursor-pointer relative p-2">
-                  <span className="absolute right-12 opacity-0 group-hover:opacity-100 transition-all duration-300 text-white whitespace-nowrap bg-gray-800 px-2 py-1 rounded">
+                <div className="group relative flex cursor-pointer items-center p-2">
+                  <span className="absolute right-12 whitespace-nowrap rounded bg-gray-800 px-2 py-1 text-white opacity-0 transition-all duration-300 group-hover:opacity-100">
                     {entityName || formattedMixin}
                   </span>
                   <div className="relative z-10">
diff --git a/src/editor/components/scenegraph/Toolbar.js b/src/editor/components/scenegraph/Toolbar.js
index b1fd5f4a..ad24b0cd 100644
--- a/src/editor/components/scenegraph/Toolbar.js
+++ b/src/editor/components/scenegraph/Toolbar.js
@@ -312,17 +312,17 @@ export default class Toolbar extends Component {
   render() {
     const isEditor = !!this.state.inspectorEnabled;
     return (
-      <div id="toolbar" className="justify-center m-4">
-        <div className="grid grid-cols-5 grid-flow-dense justify-between">
+      <div id="toolbar" className="m-4 justify-center">
+        <div className="grid grid-flow-dense grid-cols-5 justify-between">
           <div className="col-span-2">
             <Logo onToggleEdit={this.toggleEdit} isEditor={isEditor} />
           </div>
           {isEditor && (
             <>
-              <div className="flex items-center justify-center col-span-1">
+              <div className="col-span-1 flex items-center justify-center">
                 <CameraToolbar />
               </div>
-              <div className="flex items-center justify-end space-x-2 col-span-2">
+              <div className="col-span-2 flex items-center justify-end space-x-2">
                 <Button
                   leadingIcon={<Edit24Icon />}
                   onClick={this.newHandler}
@@ -419,7 +419,7 @@ export default class Toolbar extends Component {
           )}
         </div>
         {isEditor && (
-          <div className="undoRedoActions flex justify-end space-x-2 mt-2 mr-14">
+          <div className="undoRedoActions mr-14 mt-2 flex justify-end space-x-2">
             <UndoRedo />
           </div>
         )}