diff --git a/build/css/main.css b/build/css/main.css
index 242f9b6d..e962564e 100644
--- a/build/css/main.css
+++ b/build/css/main.css
@@ -6448,8 +6448,8 @@ button.btn:focus, button.progress-button:focus {
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-.component-drive-selector-body .list-group-item-header {
-  margin-bottom: 8px; }
+.component-drive-selector-body .list-group-item-footer {
+  margin-top: 8px; }
 
 .component-drive-selector-body .list-group-item[disabled] .list-group-item-heading {
   color: #aaaaaa; }
diff --git a/lib/gui/components/drive-selector/styles/_drive-selector.scss b/lib/gui/components/drive-selector/styles/_drive-selector.scss
index 14afadd2..0cc44dea 100644
--- a/lib/gui/components/drive-selector/styles/_drive-selector.scss
+++ b/lib/gui/components/drive-selector/styles/_drive-selector.scss
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-.component-drive-selector-body .list-group-item-header {
-  margin-bottom: 8px;
+.component-drive-selector-body .list-group-item-footer {
+  margin-top: 8px;
 }
 
 .component-drive-selector-body .list-group-item[disabled] .list-group-item-heading {
diff --git a/lib/gui/components/drive-selector/templates/drive-selector-modal.tpl.html b/lib/gui/components/drive-selector/templates/drive-selector-modal.tpl.html
index 4d79629e..33babfe0 100644
--- a/lib/gui/components/drive-selector/templates/drive-selector-modal.tpl.html
+++ b/lib/gui/components/drive-selector/templates/drive-selector-modal.tpl.html
@@ -9,7 +9,10 @@
       ng-disabled="!modal.state.isDriveValid(drive)"
       ng-click="modal.state.isDriveValid(drive) && modal.state.toggleSetDrive(drive)">
         <div>
-          <header class="list-group-item-header">
+          <h4 class="list-group-item-heading">{{ drive.description }} - {{ drive.size | gigabyte | number:1 }} GB</h4>
+          <p class="list-group-item-text">{{ drive.name }}</p>
+
+          <footer class="list-group-item-footer">
 
             <!-- There can be a case where the device it not large enough, and it's also locked. -->
             <!-- Since in this case both labels will be displayed, we chose to only show the -->
@@ -26,9 +29,7 @@
                 <i class="glyphicon glyphicon-lock"></i>
                 LOCKED</span>
 
-          </header>
-          <h4 class="list-group-item-heading">{{ drive.description }} - {{ drive.size | gigabyte | number:1 }} GB</h4>
-          <p class="list-group-item-text">{{ drive.name }}</p>
+          </footer>
         </div>
         <span class="tick tick--success"
           ng-show="modal.state.isDriveValid(drive)"