diff --git a/plugins/qeta/src/components/QuestionsContainer/NoQuestionsCard.tsx b/plugins/qeta/src/components/QuestionsContainer/NoQuestionsCard.tsx
new file mode 100644
index 00000000..e781f16e
--- /dev/null
+++ b/plugins/qeta/src/components/QuestionsContainer/NoQuestionsCard.tsx
@@ -0,0 +1,40 @@
+import { Card, CardContent, Grid, Typography } from '@material-ui/core';
+import { LinkButton } from '@backstage/core-components';
+import HelpOutline from '@material-ui/icons/HelpOutline';
+import React from 'react';
+
+export const NoQuestionsCard = (props: {
+  showNoQuestionsBtn?: boolean;
+  entity?: string;
+}) => {
+  const { showNoQuestionsBtn, entity } = props;
+
+  return (
+    <Card style={{ marginTop: '2rem' }}>
+      <CardContent>
+        <Grid
+          container
+          justifyContent="center"
+          alignItems="center"
+          direction="column"
+        >
+          <Grid item>
+            <Typography variant="h6">No questions found</Typography>
+          </Grid>
+          {showNoQuestionsBtn && (
+            <Grid item>
+              <LinkButton
+                to={entity ? `/qeta/ask?entity=${entity}` : '/qeta/ask'}
+                startIcon={<HelpOutline />}
+                color="primary"
+                variant="outlined"
+              >
+                Go ahead and ask one!
+              </LinkButton>
+            </Grid>
+          )}
+        </Grid>
+      </CardContent>
+    </Card>
+  );
+};
diff --git a/plugins/qeta/src/components/QuestionsContainer/QuestionList.tsx b/plugins/qeta/src/components/QuestionsContainer/QuestionList.tsx
index 2254e3b1..4c1212e8 100644
--- a/plugins/qeta/src/components/QuestionsContainer/QuestionList.tsx
+++ b/plugins/qeta/src/components/QuestionsContainer/QuestionList.tsx
@@ -1,5 +1,5 @@
 import { useStyles } from '../../utils/hooks';
-import { LinkButton, Progress, WarningPanel } from '@backstage/core-components';
+import { Progress, WarningPanel } from '@backstage/core-components';
 import {
   Box,
   Divider,
@@ -8,13 +8,12 @@ import {
   MenuItem,
   Select,
   Tooltip,
-  Typography,
 } from '@material-ui/core';
 import React from 'react';
 import { QuestionListItem } from './QuestionListItem';
 import { Pagination } from '@material-ui/lab';
 import { QuestionsResponse } from '@drodil/backstage-plugin-qeta-common';
-import HelpOutline from '@material-ui/icons/HelpOutline';
+import { NoQuestionsCard } from './NoQuestionsCard';
 
 export const QuestionList = (props: {
   loading: boolean;
@@ -66,28 +65,10 @@ export const QuestionList = (props: {
 
   if (!response.questions || response.questions.length === 0) {
     return (
-      <Grid
-        container
-        justifyContent="center"
-        alignItems="center"
-        direction="column"
-      >
-        <Grid item>
-          <Typography variant="h6">No questions found</Typography>
-        </Grid>
-        {showNoQuestionsBtn && (
-          <Grid item>
-            <LinkButton
-              to={entity ? `/qeta/ask?entity=${entity}` : '/qeta/ask'}
-              startIcon={<HelpOutline />}
-              color="primary"
-              variant="outlined"
-            >
-              Go ahead and ask one!
-            </LinkButton>
-          </Grid>
-        )}
-      </Grid>
+      <NoQuestionsCard
+        showNoQuestionsBtn={showNoQuestionsBtn}
+        entity={entity}
+      />
     );
   }